Merge branch 'master' of git.projectsegfau.lt:ProjectSegfault/ansible

all/playbook.yaml

@@ -208,6 +208,11 @@
         dest: "/etc/borgmatic/config.yaml"
         state: "absent"
         regexp: "^.*encryption_passphrase"
+    - name: Copy per-server docker daemon.json
+      ansible.builtin.copy:
+        src: "./templates/{{ inventory_hostname }}/daemon.json"
+        dest: /etc/docker/daemon.json
+        mode: preserve
   handlers:
     - name: Restart sshd
       ansible.builtin.service:

all/templates/eu/daemon.json

@@ -0,0 +1,18 @@
+{
+ "experimental": true,
+ "ip6tables": true,
+ "ipv6": true,
+ "fixed-cidr-v6": "fd00::/64",
+ "log-driver": "local",
+ "default-address-pools": [
+    { "base": "172.17.0.0/16", "size": 16 },
+    { "base": "172.18.0.0/16", "size": 16 },
+    { "base": "172.19.0.0/16", "size": 16 },
+    { "base": "172.20.0.0/14", "size": 16 },
+    { "base": "172.24.0.0/14", "size": 16 },
+    { "base": "172.28.0.0/14", "size": 16 },
+    { "base": "192.168.0.0/16", "size": 20 },
+    { "base": "2001:db8::/104", "size": 112 }                                                                                                                                 
+  ]                                                                                                                                                                           
+                                                                                                                                                                              
+}

all/templates/in/daemon.json

@@ -0,0 +1,13 @@
+{
+"ipv6": true,
+"log-driver": "local",
+"fixed-cidr-v6": "2001:db8:1::/64",
+  "default-address-pools": [
+              {
+                            "base": "172.80.0.0/16",
+                                  "size": 24
+                                      }
+  ],
+  "experimental": true,
+  "ip6tables": true
+}

all/templates/us/daemon.json

@@ -0,0 +1,5 @@
+{
+"log-driver": "local",
+"ipv6": true,
+"fixed-cidr-v6": "fd00:dead:beef::/48"
+}

privfrontends/templates/Caddyfile.j2

@@ -136,6 +136,9 @@ n.eu.psf.lt n.us.psf.lt n.in.psf.lt {
 {% endif %}
 libreddit.{{ server_prefix }}.projectsegfau.lt libreddit.projectsegfau.lt lr.psf.lt lr.{{ server_prefix }}.psf.lt {
 	reverse_proxy :6464
+	route {
+		reverse_proxy /preview/* :6465
+	}
 	import def
 	log {
 		# This is temporarily required to monitor nitter traffic due to scrapers being more active, so we need to monitor and rate limit them at a later date.

privfrontends/vars.yaml

@@ -114,7 +114,7 @@ apps:
           - name: redlib
             image: quay.io/redlib/redlib:latest
             ports:
-              - "8080"
+              - "6465:8080"
             environment:
               FRONT_PAGE: popular
               COMMENT_SORT: new