summaryrefslogtreecommitdiff
path: root/installation/init.d
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-08-10 11:32:24 -0500
committerMark Felder <feld@FreeBSD.org>2020-08-10 11:32:24 -0500
commit024b7ce0b79f4f0c0106eefb9e7dcd459ced61b4 (patch)
treed862c79e2296286af0b41d0a884796680627f298 /installation/init.d
parente08ea01d09c67a93801aa05d33bad0eb24dfca8b (diff)
parent93fbf399543fead24f8066d0cba33a0a51b89dd3 (diff)
downloadpleroma-024b7ce0b79f4f0c0106eefb9e7dcd459ced61b4.tar.gz
pleroma-024b7ce0b79f4f0c0106eefb9e7dcd459ced61b4.zip
Merge branch 'develop' into fix/activity-expirations-again
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}