diff options
| author | lain <lain@soykaf.club> | 2020-11-17 15:01:38 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-11-17 15:01:38 +0100 |
| commit | fec1ed802ef44a700df27aa132146f79e9e4cd6d (patch) | |
| tree | 6bbb39b647305521209bebbd7bdea3e4be012d1c /installation | |
| parent | 81293e5aadd5f1dfe7f90f6a71f625ef86cf3359 (diff) | |
| parent | 9b9afe6b3fde77ef005629fe2d198160c8f465a1 (diff) | |
| download | pleroma-fec1ed802ef44a700df27aa132146f79e9e4cd6d.tar.gz pleroma-fec1ed802ef44a700df27aa132146f79e9e4cd6d.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
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 63e83ed6e..8338228d8 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 |