Split archive role into archive_web for archive-mirrors

To simplify the archive role, split it up in the web serving part for
the archive-mirrors, gemini and keep the archive role for only the
archive operation. This simplifies the new role as only two lines are
required to setup the the archive mirror website.

host_vars/america.mirror.pkgbuild.com

 hostname: "america.mirror.pkgbuild.com"
+archive_domain: "america.archive.pkgbuild.com"
 ipv4_address: "143.244.34.62"
 ipv4_netmask: "/25"
 ipv4_gateway: "143.244.34.126"

host_vars/asia.mirror.pkgbuild.com

 hostname: "asia.mirror.pkgbuild.com"
+archive_domain: "asia.archive.pkgbuild.com"
 ipv4_address: "84.17.57.98"
 ipv4_netmask: "/24"
 ipv4_gateway: "84.17.57.110"

host_vars/europe.mirror.pkgbuild.com

 hostname: "europe.mirror.pkgbuild.com"
+archive_domain: "europe.archive.pkgbuild.com"
 ipv4_address: "89.187.191.12"
 ipv4_netmask: "/26"
 ipv4_gateway: "89.187.191.62"

playbooks/archive-mirrors.yml

@@ -12,5 +12,5 @@
     - { role: certbot }
     - { role: nginx }
     - { role: unbound }
-    - { role: syncarchive, tags: ['nginx'] }
-    - { role: archive, archive_nginx_only: true, archive_dir: "/srv/archive"}
+    - { role: syncarchive }
+    - { role: archive_web }

playbooks/gemini.archlinux.org.yml

@@ -21,6 +21,7 @@
     - { 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: archive_web }
     - { role: postfix, postfix_relayhost: "mail.archlinux.org" }
     - { role: fail2ban }
     - sogrep

roles/archive/defaults/main.yml

@@ -5,4 +5,3 @@ archive_user_home: '/home/archive'
 archive_repo: '{{ archive_user_home }}/archive-uploader'
 archive_uploader_version: 'v0.15.3'
 archive_dir: '/srv/archive'
-archive_nginx_only: false

roles/archive/tasks/main.yml

@@ -10,7 +10,6 @@
     owner: archive
     group: archive
     mode: 0755
-  when: not archive_nginx_only
 
 - name: setup archive configuration
   template:
@@ -19,35 +18,12 @@
     owner: root
     group: root
     mode: 0644
-  when: not archive_nginx_only
 
 - name: setup archive timer
   systemd: name=archive.timer enabled=yes state=started
-  when: not archive_nginx_only
 
 - name: setup archive-hardlink timer
   systemd: name=archive-hardlink.timer enabled=yes state=started
-  when: not archive_nginx_only
-
-- name: set up nginx
-  template:
-    src: nginx.d.conf.j2
-    dest: /etc/nginx/nginx.d/archive.conf
-    owner: root
-    group: root
-    mode: 0644
-  notify:
-    - reload nginx
-  tags: ['nginx']
-
-- name: make nginx log dir
-  file:
-    path: /var/log/nginx/{{ archive_domain }}
-    state: directory
-    owner: root
-    group: root
-    mode: 0755
-
 - name: install internet archive packages
   pacman: name=python-internetarchive,python-xtarfile state=present
 

roles/archive_web/defaults/main.yml

+---
+
+archive_dir: '/srv/archive'

roles/archive_web/tasks/main.yml

+---
+
+- name: set up nginx
+  template:
+    src: nginx.d.conf.j2
+    dest: /etc/nginx/nginx.d/archive.conf
+    owner: root
+    group: root
+    mode: 0644
+  notify:
+    - reload nginx
+  tags: ['nginx']
+
+- name: make nginx log dir
+  file:
+    path: /var/log/nginx/{{ archive_domain }}
+    state: directory
+    owner: root
+    group: root
+    mode: 0755