summaryrefslogtreecommitdiff
path: root/installation/init.d
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-11-17 15:01:38 +0100
committerlain <lain@soykaf.club>2020-11-17 15:01:38 +0100
commitfec1ed802ef44a700df27aa132146f79e9e4cd6d (patch)
tree6bbb39b647305521209bebbd7bdea3e4be012d1c /installation/init.d
parent81293e5aadd5f1dfe7f90f6a71f625ef86cf3359 (diff)
parent9b9afe6b3fde77ef005629fe2d198160c8f465a1 (diff)
downloadpleroma-fec1ed802ef44a700df27aa132146f79e9e4cd6d.tar.gz
pleroma-fec1ed802ef44a700df27aa132146f79e9e4cd6d.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
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}