diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-11-11 19:53:40 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-11-11 19:53:40 +0400 |
| commit | 08cbd655d14c74ced77e7af2c0acecf554e0ed91 (patch) | |
| tree | 4ffb3f3fa62e046e299df0378a56fb52a5b042cb /installation | |
| parent | e46c95b826c3fb98efa15cf6fd5d6cf2fb9797af (diff) | |
| parent | 3cd7ea693fa820c04257b893725100eccf1cc96c (diff) | |
| download | pleroma-08cbd655d14c74ced77e7af2c0acecf554e0ed91.tar.gz pleroma-08cbd655d14c74ced77e7af2c0acecf554e0ed91.zip | |
Merge branch 'develop' into frontend-admin-api
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 |