summaryrefslogtreecommitdiff
path: root/installation/init.d
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2020-10-19 15:31:56 +0400
committerEgor Kislitsyn <egor@kislitsyn.com>2020-10-19 15:31:56 +0400
commit18a91d85e59eb67a2d58a28aae732c34b75ebe97 (patch)
treee18b75fb8e2bdffc60a00fa74c51b47177bd9bfd /installation/init.d
parent2a475622eea5550c9ab455c4e86212fc09ee9c58 (diff)
parent0495a07dc77d81abf46cbe166ae3fec14f705809 (diff)
downloadpleroma-18a91d85e59eb67a2d58a28aae732c34b75ebe97.tar.gz
pleroma-18a91d85e59eb67a2d58a28aae732c34b75ebe97.zip
Merge branch 'develop' into feature/local-only-scope
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}