Commit 5dc453cc authored by Jelle van der Waa's avatar Jelle van der Waa 🚧 Committed by Jelle van der Waa
Browse files

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.
parent 73fb00f6
Pipeline #3518 passed with stage
in 44 seconds
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"
......
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"
......
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"
......
......@@ -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 }
......@@ -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
......
......@@ -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
......@@ -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
......
---
archive_dir: '/srv/archive'
---
- 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
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment