Move Mastodon to grimes

ansible/main.yml

@@ -1,145 +1,145 @@
-- hosts: all
-  roles:
-    - base
-    - role: realorangeone.reflector
-      when: ansible_os_family == 'Archlinux'
-    - role: paccache
-      when: ansible_os_family == 'Archlinux'
+# - hosts: all
+#   roles:
+#     - base
+#     - role: realorangeone.reflector
+#       when: ansible_os_family == 'Archlinux'
+#     - role: paccache
+#       when: ansible_os_family == 'Archlinux'
 
-- hosts: casey
-  roles:
-    - nginx
-    - geerlingguy.certbot
-    - gateway
-    - headscale
-    - restic
-    - glinet_vpn
+# - hosts: casey
+#   roles:
+#     - nginx
+#     - geerlingguy.certbot
+#     - gateway
+#     - headscale
+#     - restic
+#     - glinet_vpn
 
-- hosts:
-    - pve
-    - casey
-    - ingress
-    - walker
-    - tang
-    - grimes
-  roles:
-    - role: geerlingguy.ntp
-      vars:
-        ntp_timezone: "{{ timezone }}"
-        ntp_manage_config: true
+# - hosts:
+#     - pve
+#     - casey
+#     - ingress
+#     - walker
+#     - tang
+#     - grimes
+#   roles:
+#     - role: geerlingguy.ntp
+#       vars:
+#         ntp_timezone: "{{ timezone }}"
+#         ntp_manage_config: true
 
-- hosts:
-    - pve-docker
-    - forrest
-    - walker
-    - renovate
-    - gitea-runner
-    - grimes
-  roles:
-    - geerlingguy.docker
-    - docker_cleanup
+# - hosts:
+#     - pve-docker
+#     - forrest
+#     - walker
+#     - renovate
+#     - gitea-runner
+#     - grimes
+#   roles:
+#     - geerlingguy.docker
+#     - docker_cleanup
 
-- hosts:
-    - pve-docker
-    - forrest
-    - walker
-    - grimes
-  roles:
-    - db_auto_backup
+# - hosts:
+#     - pve-docker
+#     - forrest
+#     - walker
+#     - grimes
+#   roles:
+#     - db_auto_backup
 
-- hosts:
-    - pve-docker
-    - grimes
-  roles:
-    - traefik
+# - hosts:
+#     - pve-docker
+#     - grimes
+#   roles:
+#     - traefik
 
-- hosts:
-    - ingress
-    - walker
-    - casey
-    - grimes
-  become: false  # Forcefully run as current user
-  roles:
-    - artis3n.tailscale
+# - hosts:
+#     - ingress
+#     - walker
+#     - casey
+#     - grimes
+#   become: false  # Forcefully run as current user
+#   roles:
+#     - artis3n.tailscale
 
-- hosts: pve-docker
-  roles:
-    - pve_docker
-    - yourls
-    - privatebin
-    - vaultwarden
-    - tandoor
-    - mastodon
-    - forgejo
-    - vikunja
-    - pocket_id
-    - minio
-    - ntfy
-    - baby_buddy
-    - immich
-    - freshrss
-    - atuin
+# - hosts: pve-docker
+#   roles:
+#     - pve_docker
+#     - yourls
+#     - privatebin
+#     - vaultwarden
+#     - tandoor
+#     - forgejo
+#     - vikunja
+#     - pocket_id
+#     - minio
+#     - ntfy
+#     - baby_buddy
+#     - immich
+#     - freshrss
+#     - atuin
 
-- hosts: ingress
-  roles:
-    - nginx
-    - ingress
+# - hosts: ingress
+#   roles:
+#     - nginx
+#     - ingress
 
-- hosts: pve
-  roles:
-    - ironicbadger.proxmox_nag_removal
-    - zfs
-    - ironicbadger.snapraid
-    - prometheus.prometheus.node_exporter
+# - hosts: pve
+#   roles:
+#     - ironicbadger.proxmox_nag_removal
+#     - zfs
+#     - ironicbadger.snapraid
+#     - prometheus.prometheus.node_exporter
 
-- hosts: forrest
-  roles:
-    - prometheus
-    - uptime_kuma
-    - pve_tailscale_route
+# - hosts: forrest
+#   roles:
+#     - prometheus
+#     - uptime_kuma
+#     - pve_tailscale_route
 
-- hosts: qbittorrent
-  roles:
-    - nginx
-    - qbittorrent
-    - http_proxy
+# - hosts: qbittorrent
+#   roles:
+#     - nginx
+#     - qbittorrent
+#     - http_proxy
 
-- hosts: walker
-  roles:
-    - nginx
-    - geerlingguy.certbot
-    - coredns_docker_proxy
-    - plausible
-    - restic
-    - website
-    - slides
-    - comentario
+# - hosts: walker
+#   roles:
+#     - nginx
+#     - geerlingguy.certbot
+#     - coredns_docker_proxy
+#     - plausible
+#     - restic
+#     - website
+#     - slides
+#     - comentario
 
-- hosts: jellyfin
-  roles:
-    - jellyfin
+# - hosts: jellyfin
+#   roles:
+#     - jellyfin
 
-- hosts: restic
-  roles:
-    - restic
-    - s3_sync
+# - hosts: restic
+#   roles:
+#     - restic
+#     - s3_sync
 
-- hosts: gitea-runner
-  roles:
-    - forgejo_runner
+# - hosts: gitea-runner
+#   roles:
+#     - forgejo_runner
 
-- hosts: renovate
-  roles:
-    - renovate
+# - hosts: renovate
+#   roles:
+#     - renovate
 
-- hosts: tang
-  roles:
-    - adguardhome
-    - prometheus.prometheus.node_exporter
-    - restic
+# - hosts: tang
+#   roles:
+#     - adguardhome
+#     - prometheus.prometheus.node_exporter
+#     - restic
 
 - hosts: grimes
   roles:
     - restic
     - prometheus.prometheus.node_exporter
     - bsky
+    - mastodon

ansible/roles/mastodon/files/docker-compose.yml

@@ -23,11 +23,9 @@ services:
       - WEB_CONCURRENCY=0  # 0 means 1, but not in clustered mode
       - SIDEKIQ_THREADS=1
       - SIDEKIQ_CONCURRENCY=1
-      - HTTP_PROXY={{ pve_hosts.qbittorrent.ip }}:3128
-      - HTTPS_PROXY={{ pve_hosts.qbittorrent.ip }}:3128
     restart: unless-stopped
     volumes:
-      - "{{ app_data_dir }}/mastodon:/config/mastodon"
+      - ./config:/config/mastodon
     depends_on:
       - db
       - redis
@@ -47,7 +45,7 @@ services:
     image: postgres:14-alpine
     restart: unless-stopped
     volumes:
-      - /mnt/speed/dbs/postgres/mastodon:/var/lib/postgresql/data
+      - ./db:/var/lib/postgresql/data
     environment:
       - POSTGRES_PASSWORD=mastodon
       - POSTGRES_USER=mastodon
@@ -56,7 +54,7 @@ services:
     image: redis:7-alpine
     restart: unless-stopped
     volumes:
-      - /mnt/speed/dbs/redis/mastodon:/data
+      - ./redis:/data
 
 networks:
   traefik:

terraform/theorangeone.net.tf

@@ -236,7 +236,7 @@ resource "gandi_livedns_record" "theorangeonenet_mastodon" {
   type = "CNAME"
   ttl  = 3600
   values = [
-    "${gandi_livedns_record.sys_domain_pve.name}.${gandi_livedns_record.sys_domain_pve.zone}."
+    "${gandi_livedns_record.sys_domain_grimes.name}.${gandi_livedns_record.sys_domain_grimes.zone}."
   ]
 }