From: Christian Heller <c.heller@plomlompom.de>
Date: Sat, 7 Mar 2020 22:01:06 +0000 (+0100)
Subject: Refactor.
X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/%7B%7Bdb.prefix%7D%7D/%7B%7B%20web_path%20%7D%7D/decks/task?a=commitdiff_plain;h=a21865b8ee3bc737357a6267c05e7bc307af57d7;p=config

Refactor.
---

diff --git a/buster/etc_files/pleroma/var/lib/pleroma/static/instance/panel.html b/buster/etc_files/pleroma/var/lib/pleroma/static/instance/panel.html
new file mode 100644
index 0000000..8e2e67f
--- /dev/null
+++ b/buster/etc_files/pleroma/var/lib/pleroma/static/instance/panel.html
@@ -0,0 +1,4 @@
+<div style="margin: 1em;">
+  <p>Privacy: Visitor IP addresses are anonymized in the logs.</p>
+  <p>Contact: See <a href="https://plomlompom.com/contact.html">plomlompom.com contact page</a>.</p>
+</div>
diff --git a/buster/etc_files/pleroma/var/lib/pleroma/static/robots.txt b/buster/etc_files/pleroma/var/lib/pleroma/static/robots.txt
new file mode 100644
index 0000000..eb05362
--- /dev/null
+++ b/buster/etc_files/pleroma/var/lib/pleroma/static/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow:
diff --git a/buster/etc_files/pleroma/var/lib/pleroma/static/static/terms-of-service.html b/buster/etc_files/pleroma/var/lib/pleroma/static/static/terms-of-service.html
new file mode 100644
index 0000000..7268bac
--- /dev/null
+++ b/buster/etc_files/pleroma/var/lib/pleroma/static/static/terms-of-service.html
@@ -0,0 +1 @@
+This is <a href="https://plomlompom.com">plomlompom</a>'s personal single-user Pleroma instance.
diff --git a/buster/other_files/pleroma_robots.txt b/buster/other_files/pleroma_robots.txt
new file mode 100644
index 0000000..eb05362
--- /dev/null
+++ b/buster/other_files/pleroma_robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow:
diff --git a/buster/setup_scripts/setup_pleroma_otp.sh b/buster/setup_scripts/setup_pleroma_otp.sh
index 49d28b9..b22adcf 100755
--- a/buster/setup_scripts/setup_pleroma_otp.sh
+++ b/buster/setup_scripts/setup_pleroma_otp.sh
@@ -12,7 +12,7 @@ mail="$2"
 # Install dependencies, set up firewall.
 config_tree_prefix="${HOME}/config/buster"
 ./install_for_target.sh web pleroma pleroma_otp
-./copy_dirtree.sh "${config_tree_prefix}/etc_files" "" web
+./copy_dirtree.sh "${config_tree_prefix}/etc_files" "" web pleroma
 nft -f /etc/nftables.conf
 
 # Set up letsencrypt certificate. TODO: Is it auto-renewed?
@@ -70,10 +70,11 @@ cp "${config_tree_prefix}/other_files/pixel.png" /var/lib/pleroma/static/
 chown pleroma:nogroup /var/lib/pleroma/static/pixel.png
 
 # Info panel and TOS.
-mkdir -p /var/lib/pleroma/static/instance
-mkdir -p /var/lib/pleroma/static/static
-cp "${config_tree_prefix}/other_files/pleroma_panel.html" /var/lib/pleroma/static/instance/panel.html
-cp "${config_tree_prefix}/other_files/pleroma_terms-of-service.html" /var/lib/pleroma/static/static/terms-of-service.html
+#mkdir -p /var/lib/pleroma/static/instance
+#mkdir -p /var/lib/pleroma/static/static
+#cp "${config_tree_prefix}/other_files/pleroma_panel.html" /var/lib/pleroma/static/instance/panel.html
+#cp "${config_tree_prefix}/other_files/pleroma_terms-of-service.html" /var/lib/pleroma/static/static/terms-of-service.html
+#cp "${config_tree_prefix}/other_files/pleroma_robots.txt" /var/lib/pleroma/static/robots.txt
 
 # Prepare NGINX config for Pleroma.
 cp /opt/pleroma/installation/pleroma.nginx /etc/nginx/sites-available/pleroma.nginx
diff --git a/buster/setup_scripts/setup_pleroma_source.sh b/buster/setup_scripts/setup_pleroma_source.sh
index 82b3203..fb390b4 100755
--- a/buster/setup_scripts/setup_pleroma_source.sh
+++ b/buster/setup_scripts/setup_pleroma_source.sh
@@ -13,7 +13,7 @@ mail="$2"
 # Install dependencies, configs, set up firewall.
 config_tree_prefix="${HOME}/config/buster"
 ./install_for_target.sh web pleroma pleroma_source
-./copy_dirtree.sh "${config_tree_prefix}/etc_files" "" web
+./copy_dirtree.sh "${config_tree_prefix}/etc_files" "" web pleroma
 nft -f /etc/nftables.conf
 
 # Prepare user.
@@ -65,10 +65,11 @@ cp "${config_tree_prefix}/other_files/pixel.png" /var/lib/pleroma/static/
 chown pleroma:nogroup /var/lib/pleroma/static/pixel.png
 
 # Info panel and TOS.
-mkdir -p /var/lib/pleroma/static/instance
-mkdir -p /var/lib/pleroma/static/static
-cp "${config_tree_prefix}/other_files/pleroma_panel.html" /var/lib/pleroma/static/instance/panel.html
-cp "${config_tree_prefix}/other_files/pleroma_terms-of-service.html" /var/lib/pleroma/static/static/terms-of-service.html
+#mkdir -p /var/lib/pleroma/static/instance
+#mkdir -p /var/lib/pleroma/static/static
+#cp "${config_tree_prefix}/other_files/pleroma_panel.html" /var/lib/pleroma/static/instance/panel.html
+#cp "${config_tree_prefix}/other_files/pleroma_terms-of-service.html" /var/lib/pleroma/static/static/terms-of-service.html
+#cp "${config_tree_prefix}/other_files/pleroma_robots.txt" /var/lib/pleroma/static/robots.txt
 
 # Upload directory. For some reason this does not exist yet here.
 mkdir -p /var/lib/pleroma/uploads