summaryrefslogtreecommitdiff
path: root/installation/init.d
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-07-29 16:24:22 +0200
committerlain <lain@soykaf.club>2020-07-29 16:24:22 +0200
commitdc36d6e9d21dc47fa9b6332c6444a055f789fabd (patch)
treed24ffb684053b9042339396eeb8bc02368ed6602 /installation/init.d
parentf715bf1915b75cb3c5b24d4661a94885aaa1a0ac (diff)
parenta6d3bb5f30697cafc5dd9acf490bde7e2f33f5f8 (diff)
downloadpleroma-dc36d6e9d21dc47fa9b6332c6444a055f789fabd.tar.gz
pleroma-dc36d6e9d21dc47fa9b6332c6444a055f789fabd.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-admin
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}