summaryrefslogtreecommitdiff
path: root/installation/init.d
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-11-04 16:52:30 +0100
committerlain <lain@soykaf.club>2020-11-04 16:52:30 +0100
commit7bbc328d66aaac8d680f52521c6823aea42821af (patch)
tree5fa2ef3e91fd880e9170c718cca8245d73dc4ca3 /installation/init.d
parentde2499e54b33a1746e5f6a5b79f1422d31c11570 (diff)
parent78cea44553c936813ffc2c4c47984a64255096ef (diff)
downloadpleroma-7bbc328d66aaac8d680f52521c6823aea42821af.tar.gz
pleroma-7bbc328d66aaac8d680f52521c6823aea42821af.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into stats-genserver-fix
Diffstat (limited to 'installation/init.d')
-rwxr-xr-xinstallation/init.d/pleroma1
1 files changed, 1 insertions, 0 deletions
diff --git a/installation/init.d/pleroma b/installation/init.d/pleroma
index 384536f7e..e908cda1b 100755
--- a/installation/init.d/pleroma
+++ b/installation/init.d/pleroma
@@ -8,6 +8,7 @@ pidfile="/var/run/pleroma.pid"
directory=/opt/pleroma
healthcheck_delay=60
healthcheck_timer=30
+export $(cat /opt/pleroma/config/pleroma.env)
: ${pleroma_port:-4000}