summaryrefslogtreecommitdiff
path: root/installation/init.d
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-10-26 17:50:34 +0100
committerlain <lain@soykaf.club>2020-10-26 17:50:34 +0100
commit04b7505c75afbaa1f785b2adaf0313e9b0935fab (patch)
treeda42147dc907cb7ffcc576b81b16c6c6ed0ef9ad /installation/init.d
parentb3d6cf90229ff3e9a5bd0028d4a6cbd3b68da9fe (diff)
parent2f7401806bbe5427bbcaa7cdce35130320ae3bb4 (diff)
downloadpleroma-04b7505c75afbaa1f785b2adaf0313e9b0935fab.tar.gz
pleroma-04b7505c75afbaa1f785b2adaf0313e9b0935fab.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-block-behavior
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}