diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-08-10 11:32:24 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-08-10 11:32:24 -0500 |
| commit | 024b7ce0b79f4f0c0106eefb9e7dcd459ced61b4 (patch) | |
| tree | d862c79e2296286af0b41d0a884796680627f298 /installation | |
| parent | e08ea01d09c67a93801aa05d33bad0eb24dfca8b (diff) | |
| parent | 93fbf399543fead24f8066d0cba33a0a51b89dd3 (diff) | |
| download | pleroma-024b7ce0b79f4f0c0106eefb9e7dcd459ced61b4.tar.gz pleroma-024b7ce0b79f4f0c0106eefb9e7dcd459ced61b4.zip | |
Merge branch 'develop' into fix/activity-expirations-again
Diffstat (limited to 'installation')
| -rwxr-xr-x | installation/init.d/pleroma | 1 | ||||
| -rw-r--r-- | installation/pleroma.service | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/installation/init.d/pleroma b/installation/init.d/pleroma index e908cda1b..384536f7e 100755 --- a/installation/init.d/pleroma +++ b/installation/init.d/pleroma @@ -8,7 +8,6 @@ pidfile="/var/run/pleroma.pid" directory=/opt/pleroma healthcheck_delay=60 healthcheck_timer=30 -export $(cat /opt/pleroma/config/pleroma.env) : ${pleroma_port:-4000} diff --git a/installation/pleroma.service b/installation/pleroma.service index ee00a3b7a..5dcbc1387 100644 --- a/installation/pleroma.service +++ b/installation/pleroma.service @@ -17,8 +17,6 @@ Environment="MIX_ENV=prod" Environment="HOME=/var/lib/pleroma" ; Path to the folder containing the Pleroma installation. WorkingDirectory=/opt/pleroma -; Path to the environment file. the file contains RELEASE_COOKIE and etc -EnvironmentFile=/opt/pleroma/config/pleroma.env ; Path to the Mix binary. ExecStart=/usr/bin/mix phx.server |