playbooks/db.yml

@@ -43,16 +43,9 @@
             owner: nextcloud-desultd
           - name: pleroma_cowfee
             owner: pleroma-cowfee
-          - name: peertube
+          - name: peertube_cowfee
             owner: peertube-cowfee
       tags: [ db, psql ]
-  tasks:
-    - name: enable db extensions for peertube
-      postgresql_ext: name={{ item }} db=peertube
-      with_items:
-        - pg_trgm
-        - unaccent
-      tags: [ db, psql, ext ]
 - hosts: psql1.9iron.club
   roles:
     - role: backup

playbooks/web.yml

@@ -136,11 +136,6 @@
     - role: certbot
       tags: [ web, certbot ]
 - hosts: web2.desu.ltd
-  module_defaults:
-    docker_container:
-      state: started
-      restart_policy: unless-stopped
-      pull: yes
   tasks:
     - name: ensure docker network
       docker_network: name=web
@@ -163,72 +158,14 @@
               proxy_pass http://pleroma:4000;
             }
           }
-          server {
-            listen 443 ssl;
-            server_name tube.cowfee.moe;
-            ssl_certificate /etc/letsencrypt/live/cowfee.moe/fullchain.pem;
-            ssl_certificate_key /etc/letsencrypt/live/cowfee.moe/privkey.pem;
-            ssl_trusted_certificate /etc/letsencrypt/live/cowfee.moe/chain.pem;
-            ssl_dhparam /etc/letsencrypt/dhparams/dhparam.pem;
-            location / {
-              proxy_set_header Host $host;
-              proxy_set_header X-Real-IP $remote_addr;
-              proxy_pass http://peertube:9000;
-            }
-          }
       tags: [ docker, ingress ]
-    - name: docker deploy pleroma
-      docker_container:
-        name: pleroma
-        image: jordemort/pleroma
-        env:
-          TZ: "America/Chicago"
-          POSTGRES_HOST: 192.168.164.156
-          POSTGRES_DB: pleroma_cowfee
-          POSTGRES_USER: pleroma-cowfee
-          POSTGRES_PASSWORD: "{{ secret_pleroma_9iron_db_pass }}"
-        networks:
-          - name: web
-            aliases: [ "pleroma" ]
-        volumes:
-          - /data/pleroma/etc:/etc/pleroma
-          - /data/pleroma/static:/var/lib/pleroma/static
-          - /data/pleroma/uploads:/var/lib/pleroma/uploads
-      tags: [ docker, pleroma ]
-    - name: docker deploy redis
-      docker_container:
-        name: redis
-        image: redis:6-alpine
-        networks:
-          - name: web
-            aliases: [ "redis" ]
-      tags: [ docker, redis ]
-    - name: docker deploy peertube
-      docker_container:
-        name: peertube
-        image: chocobozzz/peertube:production-buster
-        env:
-          POSTGRES_DB: peertube_cowfee
-          PEERTUBE_DB: peertube_cowfee
-          PEERTUBE_DB_USERNAME: peertube-cowfee
-          PEERTUBE_DB_PASSWORD: "{{ secret_peertube_db_pass }}"
-          PEERTUBE_DB_HOSTNAME: 192.168.164.156
-          PEERTUBE_ADMIN_EMAIL: rehashedsalt@cock.li
-          PEERTUBE_WEBSERVER_HOSTNAME: tube.cowfee.moe
-          PEERTUBE_TRUST_PROXY: '["127.0.0.0/16", "192.168.0.0/16", "172.16.0.0/12", "10.0.0.0/8"]'
-        networks:
-          - name: web
-            aliases: [ "peertube" ]
-        ports:
-          - "1935:1935"
-        volumes:
-          - /data/peertube/data:/data
-          - /data/peertube/config:/config
-      tags: [ docker, peertube ]
     - name: docker deploy nginx proxy
       docker_container:
         name: ingress
+        state: started
         image: jonasal/nginx-certbot:2.2.0
+        restart_policy: unless-stopped
+        pull: yes
         env:
           TZ: "America/Chicago"
           CERTBOT_EMAIL: rehashedsalt@cock.li
@@ -242,6 +179,29 @@
           - /data/nginx-certbot/letsencrypt:/etc/letsencrypt
           - /data/nginx-certbot/user_conf.d:/etc/nginx/user_conf.d:ro
       tags: [ docker, ingress ]
+    - name: docker deploy pleroma
+      docker_container:
+        name: pleroma
+        state: started
+        image: jordemort/pleroma
+        restart_policy: unless-stopped
+        pull: yes
+        env:
+          TZ: "America/Chicago"
+          POSTGRES_HOST: 192.168.164.156
+          POSTGRES_DB: pleroma_cowfee
+          POSTGRES_USER: pleroma-cowfee
+          POSTGRES_PASSWORD: "{{ secret_pleroma_9iron_db_pass }}"
+        networks:
+          - name: web
+            aliases: [ "pleroma" ]
+        ports:
+          - "4000:4000"
+        volumes:
+          - /data/pleroma/etc:/etc/pleroma
+          - /data/pleroma/static:/var/lib/pleroma/static
+          - /data/pleroma/uploads:/var/lib/pleroma/uploads
+      tags: [ docker, pleroma ]
   roles:
     - role: backup
       vars: