diff options
| author | lain <lain@soykaf.club> | 2020-11-04 16:51:42 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-11-04 16:51:42 +0100 |
| commit | dd2b3a8da92e0b823ac338657588339fbf2e9c86 (patch) | |
| tree | bc0cf8bb80ec91ec759484213f567880d5c26a17 /installation/init.d | |
| parent | 8f5589cf667d8dd24da07e58db94225d81a55a7b (diff) | |
| parent | 78cea44553c936813ffc2c4c47984a64255096ef (diff) | |
| download | pleroma-dd2b3a8da92e0b823ac338657588339fbf2e9c86.tar.gz pleroma-dd2b3a8da92e0b823ac338657588339fbf2e9c86.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
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} |