summaryrefslogtreecommitdiff
path: root/installation/init.d
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2020-07-30 08:52:13 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2020-07-30 08:52:13 +0300
commitcff7bb5cd4b9e564e94a7e7f4e11c6f9ebf5bc36 (patch)
tree021c25a91263cfd9e67ad017bacf3cba41699c3b /installation/init.d
parentcd2423d7f5c082d49fb429708bb8476342b35136 (diff)
parenta6d3bb5f30697cafc5dd9acf490bde7e2f33f5f8 (diff)
downloadpleroma-cff7bb5cd4b9e564e94a7e7f4e11c6f9ebf5bc36.tar.gz
pleroma-cff7bb5cd4b9e564e94a7e7f4e11c6f9ebf5bc36.zip
Merge branch 'develop' into issue/1933-update-dependency
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}