diff options
| author | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2020-07-31 13:57:21 +0200 |
|---|---|---|
| committer | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2020-07-31 13:57:21 +0200 |
| commit | ac2598307d15bd833310f6c5cfadc218b7d80480 (patch) | |
| tree | edbc9f8750414dad4f43a2c88c348438c6900616 /installation/init.d | |
| parent | e4beff90f5670876184b2593c1b4a49f2339d048 (diff) | |
| parent | a6d3bb5f30697cafc5dd9acf490bde7e2f33f5f8 (diff) | |
| download | pleroma-ac2598307d15bd833310f6c5cfadc218b7d80480.tar.gz pleroma-ac2598307d15bd833310f6c5cfadc218b7d80480.zip | |
Merge remote-tracking branch 'pleroma/develop' into features/poll-validation
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} |