diff options
author | lain <lain@soykaf.club> | 2020-07-29 13:45:15 +0000 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-07-29 13:45:15 +0000 |
commit | a6d3bb5f30697cafc5dd9acf490bde7e2f33f5f8 (patch) | |
tree | bddf044b51cacba7c80f8b054bb3c0781628fd15 /installation/init.d | |
parent | 269b61a2402e3d12d09baf26ba73359776f556b0 (diff) | |
parent | 8d6f7aec2145fc012677cfd9f61cb3e2720edd68 (diff) | |
download | pleroma-a6d3bb5f30697cafc5dd9acf490bde7e2f33f5f8.tar.gz |
Merge branch 'issue/1023' into 'develop'
[#1023] added generated `pleroma.env`
See merge request pleroma/pleroma!2763
Diffstat (limited to 'installation/init.d')
-rwxr-xr-x | installation/init.d/pleroma | 1 |
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} |