summaryrefslogtreecommitdiff
path: root/installation/init.d
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-08-10 13:59:38 +0000
committerlain <lain@soykaf.club>2020-08-10 13:59:38 +0000
commit93fbf399543fead24f8066d0cba33a0a51b89dd3 (patch)
treec379401de63410564e8cf8e080551c3205c77ce2 /installation/init.d
parent353f3466d638efc012cdf5688d66edac20431da8 (diff)
parent5c4548d5e74e40e18d8d1ed98ad256568a063370 (diff)
downloadpleroma-93fbf399543fead24f8066d0cba33a0a51b89dd3.tar.gz
pleroma-93fbf399543fead24f8066d0cba33a0a51b89dd3.zip
Merge branch 'revert-a6d3bb5f' into 'develop'
Revert "Merge branch 'issue/1023' into 'develop'" Closes #2033 See merge request pleroma/pleroma!2868
Diffstat (limited to 'installation/init.d')
-rwxr-xr-xinstallation/init.d/pleroma1
1 files changed, 0 insertions, 1 deletions
diff --git a/installation/init.d/pleroma b/installation/init.d/pleroma
index e908cda1b..384536f7e 100755
--- a/installation/init.d/pleroma
+++ b/installation/init.d/pleroma
@@ -8,7 +8,6 @@ pidfile="/var/run/pleroma.pid"
directory=/opt/pleroma
healthcheck_delay=60
healthcheck_timer=30
-export $(cat /opt/pleroma/config/pleroma.env)
: ${pleroma_port:-4000}