From 62561c6d52d8b1c10c18a10b5f910963c978934a Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jelle@archlinux.org>
Date: Sat, 1 May 2021 14:44:35 +0200
Subject: [PATCH] Update archweb and add new systemd service
---
roles/archweb/defaults/main.yml | 2 +-
roles/archweb/tasks/main.yml | 14 ++++++++++++++
.../archweb/templates/archweb-readlinks.service.j2 | 13 +++++++++++++
3 files changed, 28 insertions(+), 1 deletion(-)
create mode 100644 roles/archweb/templates/archweb-readlinks.service.j2
diff --git a/roles/archweb/defaults/main.yml b/roles/archweb/defaults/main.yml
index 68d9850a7..acc547012 100644
--- a/roles/archweb/defaults/main.yml
+++ b/roles/archweb/defaults/main.yml
@@ -14,7 +14,7 @@ archweb_network_check_domain: 'www.archlinux.org'
archweb_allowed_hosts: ["{{ archweb_domain }}", 'ipxe.archlinux.org']
archweb_nginx_conf: '/etc/nginx/nginx.d/archweb.conf'
archweb_repository: 'https://github.com/archlinux/archweb.git'
-archweb_version: 9bc48164c5d302944191aeec269c0b859b71b45f
+archweb_version: 'c6d91ecbd49b7e593415f51a751e149e3a79ca7d'
archweb_pgp_key: ['E499C79F53C96A54E572FEE1C06086337C50773E']
archweb_site: true
archweb_mirrorcheck: false
diff --git a/roles/archweb/tasks/main.yml b/roles/archweb/tasks/main.yml
index fa72c0c4f..8902624f5 100644
--- a/roles/archweb/tasks/main.yml
+++ b/roles/archweb/tasks/main.yml
@@ -130,6 +130,12 @@
- daemon reload
when: archweb_services or archweb_reporead
+- name: install readlinks service
+ template: src="archweb-readlinks.service.j2" dest="/etc/systemd/system/archweb-readlinks.service" owner=root group=root mode=0644
+ notify:
+ - daemon reload
+ when: archweb_services or archweb_reporead
+
- name: install mirrorcheck service and timer
template: src="{{ item }}.j2" dest="/etc/systemd/system/{{ item }}" owner=root group=root mode=0644
with_items:
@@ -232,6 +238,14 @@
service: name="archweb-reporead.service" state=restarted
when: archweb_services or archweb_reporead and (release.changed or config.changed or virtualenv.changed or archweb_forced_deploy)
+- name: start and enable archweb readlinks service
+ service: name="archweb-readlinks.service" enabled=yes state=started
+ when: archweb_services or archweb_reporead
+
+- name: restart archweb readlinks service
+ service: name="archweb-readlinks.service" state=restarted
+ when: archweb_services or archweb_reporead and (release.changed or config.changed or virtualenv.changed or archweb_forced_deploy)
+
- name: start and enable archweb mirrorcheck timer
service: name="archweb-mirrorcheck.timer" enabled=yes state=started
when: archweb_services or archweb_mirrorcheck
diff --git a/roles/archweb/templates/archweb-readlinks.service.j2 b/roles/archweb/templates/archweb-readlinks.service.j2
new file mode 100644
index 000000000..17c5ce7d4
--- /dev/null
+++ b/roles/archweb/templates/archweb-readlinks.service.j2
@@ -0,0 +1,13 @@
+[Unit]
+Description=archweb read links databases (for sonames)
+After=network.target
+
+[Service]
+User=archweb
+WorkingDirectory={{ archweb_dir }}
+ExecStart={{ archweb_dir }}/env/bin/python manage.py readlinks_inotify
+Restart=on-failure
+Nice=5
+
+[Install]
+WantedBy=multi-user.target
--
GitLab