Migrate dbscripts, sogrep, archweb related services for mirrors to

gemini

playbooks/apollo.yml

@@ -6,13 +6,13 @@
       - name: assign ipv4 addresses to fact postgres_ssl_hosts4
         set_fact: postgres_ssl_hosts4="{{ [orion4] + detected_ips }}"
         vars:
-            orion4: "{{ hostvars['orion.archlinux.org']['ipv4_address'] }}/32"
+            orion4: "{{ hostvars['gemini.archlinux.org']['ipv4_address'] }}/32"
             detected_ips: "{{ groups['mirrors'] | map('extract', hostvars, ['ipv4_address']) | select() | map('regex_replace', '^(.+)$', '\\1/32') | list }}"
         tags: ["postgres", "firewall"]
       - name: assign ipv6 addresses to fact postgres_ssl_hosts6
         set_fact: postgres_ssl_hosts6="{{ [orion6] + detected_ips }}"
         vars:
-            orion6: "{{ hostvars['orion.archlinux.org']['ipv6_address'] }}/128"
+            orion6: "{{ hostvars['gemini.archlinux.org']['ipv6_address'] }}/128"
             detected_ips: "{{ groups['mirrors'] | map('extract', hostvars, ['ipv6_address']) | select() | map('regex_replace', '^(.+)$', '\\1/128') | list }}"
         tags: ["postgres", "firewall"]
 

playbooks/gemini.archlinux.org.yml

@@ -3,6 +3,9 @@
 - name: setup gemini.archlinux.org
   hosts: gemini.archlinux.org
   remote_user: root
+  vars:
+    archweb_db_host: 'apollo.archlinux.org'
+    dbscripts_commit: '20191022'
   roles:
     - { role: common }
     - { role: tools }
@@ -14,6 +17,10 @@
     - { role: zabbix-agent }
     - { role: certbot }
     - { role: nginx }
+    - { role: dbscripts, repos_domain: "repos.archlinux.org", repos_rsync_domain: "rsync.archlinux.org", svntogit_repos: "/srv/svntogit/repos", postgres_ssl: 'on', tags: ['archusers'] }
+    - { role: archweb, archweb_site: false, archweb_services: true, archweb_mirrorcheck_locations: [5, 6] }
     - { role: sources, sources_domain: "sources.archlinux.org", sources_dir: "/srv/sources" }
     - { role: archive }
+    - { role: postfwd, tags: ['mail'] }
     - { role: fail2ban }
+    - sogrep

playbooks/orion.yml

@@ -3,9 +3,6 @@
 - name: setup orion
   hosts: orion.archlinux.org
   remote_user: root
-  vars:
-    archweb_db_host: 'apollo.archlinux.org'
-    dbscripts_commit: '20191022'
   roles:
     - { role: common }
     - { role: tools }
@@ -22,10 +19,9 @@
     - { role: archusers }
     - { role: certbot }
     - { role: nginx }
-    - { role: dbscripts, repos_domain: "repos.archlinux.org", repos_rsync_domain: "rsync.archlinux.org", svntogit_repos: "/srv/svntogit/repos", postgres_ssl: 'on', tags: ['archusers'] }
     - sogrep
     - { role: sudo, tags: ['archusers'] }
-    - { role: archweb, archweb_site: false, archweb_services: true, archweb_donor_import: true, archweb_mirrorcheck_locations: [5, 6] }
+    - { role: archweb, archweb_site: false, archweb_services: false, archweb_donor_import: true, archweb_mirrorcheck_locations: [5, 6] }
     - { role: hefur, ftp_iso_dir: '/srv/ftp/iso', tags: ['torrenttracker']}
     - wkd
     - { role: fail2ban }