diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-01-18 18:31:25 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-01-18 18:31:25 +0300 |
| commit | 74346a7035d950ede143d65f8364194cb116aaf5 (patch) | |
| tree | f058b3fc2edd6868511bc6f832f75374bdbd117e /installation | |
| parent | a38f21f51dc810221cbf910556910a10f6104956 (diff) | |
| parent | 98d9dcd509ab6823e38b3ddbce1f5fc4f3d5a82c (diff) | |
| download | pleroma-74346a7035d950ede143d65f8364194cb116aaf5.tar.gz | |
Fix merge conflict
Diffstat (limited to 'installation')
| -rw-r--r-- | installation/pleroma.nginx | 4 | ||||
| -rw-r--r-- | installation/pleroma.service | 18 |
2 files changed, 16 insertions, 6 deletions
diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx index 46b84fb50..a24bb0e61 100644 --- a/installation/pleroma.nginx +++ b/installation/pleroma.nginx @@ -79,8 +79,10 @@ server { proxy_cache_valid 200 206 301 304 1h; proxy_cache_lock on; proxy_ignore_client_abort on; - proxy_buffering off; + proxy_buffering on; chunked_transfer_encoding on; + proxy_ignore_headers Cache-Control; + proxy_hide_header Cache-Control; proxy_pass http://localhost:4000; } } diff --git a/installation/pleroma.service b/installation/pleroma.service index f1ed56cb3..72090bbc7 100644 --- a/installation/pleroma.service +++ b/installation/pleroma.service @@ -3,15 +3,23 @@ Description=Pleroma social network After=network.target postgresql.service [Service] -User=pleroma -WorkingDirectory=/home/pleroma/pleroma -Environment="HOME=/home/pleroma" -Environment="MIX_ENV=prod" -ExecStart=/usr/local/bin/mix phx.server ExecReload=/bin/kill $MAINPID KillMode=process Restart=on-failure +; Name of the user that runs the Pleroma service. +User=pleroma +; Declares that Pleroma runs in production mode. +Environment="MIX_ENV=prod" + +; Make sure that all paths fit your installation. +; Path to the home directory of the user running the Pleroma service. +Environment="HOME=/home/pleroma" +; Path to the folder containing the Pleroma installation. +WorkingDirectory=/home/pleroma/pleroma +; Path to the Mix binary. +ExecStart=/usr/bin/mix phx.server + ; Some security directives. ; Use private /tmp and /var/tmp folders inside a new file system namespace, which are discarded after the process stops. PrivateTmp=true |