diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-10-15 16:39:01 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-10-15 16:39:01 -0500 |
| commit | fb056ce05b43841ce57135ffb0b25845c41639ef (patch) | |
| tree | edd3e47128b454ab721027b5c6f30d0bcc5bd27c /installation/init.d | |
| parent | 724e4b7f00041667b9fa61fd1b7dd51c8eeaa102 (diff) | |
| parent | 5703fb6d2a5f9fcffe050eadbc43758bcd2efa14 (diff) | |
| download | pleroma-fb056ce05b43841ce57135ffb0b25845c41639ef.tar.gz pleroma-fb056ce05b43841ce57135ffb0b25845c41639ef.zip | |
Merge branch 'develop' into refactor/discoverable_user_field
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} |