From e868cfe619a7e01775cc8f71a0b9e7d54c301ca3 Mon Sep 17 00:00:00 2001
From: shibayashi <shibayashi@cypherpunk.observer>
Date: Sat, 9 Feb 2019 11:39:01 +0000
Subject: Add /media to Caddy cache

---
 installation/caddyfile-pleroma.example | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'installation')

diff --git a/installation/caddyfile-pleroma.example b/installation/caddyfile-pleroma.example
index 03ff000b6..fcf76718e 100644
--- a/installation/caddyfile-pleroma.example
+++ b/installation/caddyfile-pleroma.example
@@ -23,6 +23,11 @@ example.tld  {
 
   # If you do not want to use the mediaproxy function, remove these lines.
   # To use this directive, you need the http.cache plugin for Caddy.
+  cache {
+    match_path /media
+    default_max_age 720m
+  }
+
   cache {
     match_path /proxy
     default_max_age 720m
-- 
cgit v1.2.3


From 1d8b578bb78693f4a51bb1d42701861c3c3692c2 Mon Sep 17 00:00:00 2001
From: shibayashi <shibayashi@cypherpunk.observer>
Date: Sat, 9 Feb 2019 23:08:27 +0100
Subject: Recommend the acme-challenge path that is used in the installation
 guides

---
 installation/pleroma.nginx | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'installation')

diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx
index a24bb0e61..a3d55e4bf 100644
--- a/installation/pleroma.nginx
+++ b/installation/pleroma.nginx
@@ -15,12 +15,13 @@ server {
     return         301 https://$server_name$request_uri;
 
     # Uncomment this if you need to use the 'webroot' method with certbot. Make sure
-    # that you also create the .well-known/acme-challenge directory structure in pleroma/priv/static and
-    # that is is accessible by the webserver. You may need to load this file with the ssl
-    # server block commented out, run certbot to get the certificate, and then uncomment it.
+    # that the directory exists and that it is accessible by the webserver. If you followed
+    # the guide, you already ran 'sudo mkdir -p /var/lib/letsencrypt' to create the folder.
+    # You may need to load this file with the ssl server block commented out, run certbot
+    # to get the certificate, and then uncomment it.
     #
     # location ~ /\.well-known/acme-challenge {
-    #     root <path to install>/pleroma/priv/static/;
+    #     root /var/lib/letsencrypt/.well-known/acme-challenge;
     # }
 }
 
-- 
cgit v1.2.3


From d1752a81a8f0de5401e9fcfbee0c1242c7768d6d Mon Sep 17 00:00:00 2001
From: shibayashi <shibayashi@cypherpunk.observer>
Date: Sun, 10 Feb 2019 19:25:34 +0000
Subject: Update service files of OpenRC and systemd to new recommended paths

---
 installation/init.d/pleroma  | 4 ++--
 installation/pleroma.service | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'installation')

diff --git a/installation/init.d/pleroma b/installation/init.d/pleroma
index 2b211df65..ed50bb551 100755
--- a/installation/init.d/pleroma
+++ b/installation/init.d/pleroma
@@ -1,7 +1,7 @@
 #!/sbin/openrc-run
 
 # Requires OpenRC >= 0.35
-directory=~pleroma/pleroma
+directory=/opt/pleroma
 
 command=/usr/bin/mix
 command_args="phx.server"
@@ -18,4 +18,4 @@ pidfile="/var/run/pleroma.pid"
 
 depend() {
     need nginx postgresql
-}
\ No newline at end of file
+}
diff --git a/installation/pleroma.service b/installation/pleroma.service
index 72090bbc7..5dcbc1387 100644
--- a/installation/pleroma.service
+++ b/installation/pleroma.service
@@ -14,15 +14,17 @@ 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"
+Environment="HOME=/var/lib/pleroma"
 ; Path to the folder containing the Pleroma installation.
-WorkingDirectory=/home/pleroma/pleroma
+WorkingDirectory=/opt/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
+; The /home, /root, and /run/user folders can not be accessed by this service anymore. If your Pleroma user has its home folder in one of the restricted places, or use one of these folders as its working directory, you have to set this to false.
+ProtectHome=true
 ; Mount /usr, /boot, and /etc as read-only for processes invoked by this service.
 ProtectSystem=full
 ; Sets up a new /dev mount for the process and only adds API pseudo devices like /dev/null, /dev/zero or /dev/random but not physical devices. Disabled by default because it may not work on devices like the Raspberry Pi.
-- 
cgit v1.2.3