group_vars/all/archusers.yml

@@ -219,6 +219,14 @@ arch_users:
       - packager
       - junior-packager
       - tu
+  codingkoopa:
+    name: "CodingKoopa"
+    email: "koopa@archlinux.org"
+    ssh_key: codingkoopa.pub
+    hosts:
+      - mail.archlinux.org
+    groups:
+      - support-staff
   daurnimator:
     name: "Daurnimator"
     email: "daurnimator@archlinux.org"

playbooks/man.archlinux.org.yml

@@ -15,4 +15,4 @@
     - { role: promtail }
     - { role: postgres }
     - { role: uwsgi }
-    - { role: archmanweb, archmanweb_version: 'v1.9' }
+    - { role: archmanweb, archmanweb_version: 'v1.10' }

pubkeys/codingkoopa.pub

+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCu41h56EI8OEGD3FnlwLxGydynV5Zg/NFyuc/VDoMca+ucLK3fJ2ZPcen5JOYH+/ro7hQbbOwEtR9DxX8CuMVDxBjI0QLHNzTLURjsr7HFh6zp+ZraDYdnIgigNOtveYumznIAU0dTYXPwthi3CQrWJhB4ue5FofROJXEAey97TK7T8binS+1tiFRL0yLYd8sEfsL1sSQJ6g6bnkmW29dcYTClOg8wd1CtFIMESkJ5OdJ8m+THtdLkeMXW6fApczUGm5DbGn/09lM/3/70wf1wpVzjjVLArLVvJqp93B2jihJlTz+KT7ECohbwYMKou+qcpYcCXXhw+kT/TeSHhDU9Ho8mbdqfkE4IdA6x4TQJQKkEJesFU/gdxBEgnhZipqKgztCWIGA7lZ+7yy3ZJh4Q0tjaytK/mn4X+Q0OYw8cX/o4T3xkZn0JcYkYm8/bTxD587KHAFdnAJ56uL7GP6MpkuzFg3vugGRYCZL5zcO/tzI80zFGDthi32wnYViNwy0= koopa@comet-observatory

roles/archweb/defaults/main.yml

@@ -12,7 +12,7 @@ archweb_domains_templates:
 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: 'release_2024-01-10'
+archweb_version: 'release_2024-03-05'
 archweb_pgp_key: ['E499C79F53C96A54E572FEE1C06086337C50773E']
 archweb_site: true
 archweb_mirrorcheck: false

roles/archwiki/tasks/main.yml

@@ -107,6 +107,7 @@
     - archwiki-prune-cache.service
     - archwiki-prune-cache.timer
     - archwiki-question-updater.service
+    - archwiki-question-updater.timer
 
 - name: Start and enable archwiki timers and services
   systemd:
@@ -118,6 +119,7 @@
     - archwiki-runjobs.timer
     - archwiki-prune-cache.timer
     - archwiki-runjobs-wait.service
+    - archwiki-question-updater.timer
 
 - name: Create question answer file
   systemd:
@@ -127,9 +129,3 @@
 
 - name: Ensure question answer file exists and set permissions
   file: state=file path="{{ archwiki_question_answer_file }}" owner=root group=root mode=0644
-
-- name: Create pacman.d hooks dir
-  file: state=directory owner=root group=root mode=0755 path=/etc/pacman.d/hooks
-
-- name: Install archwiki question updater hook
-  template: src=archwiki-question-updater.hook.j2 dest=/etc/pacman.d/hooks/archwiki-question-updater.hook owner=root group=root mode=0644

roles/archwiki/templates/LocalSettings.php.j2

@@ -421,7 +421,7 @@ $wgCaptchaTriggers['addurl'] = false;
 $wgCaptchaTriggers['createaccount'] = true;
 $wgCaptchaTriggers['badlogin'] = true;
 $wgCaptchaQuestions = [
-    'What is the output of: <code>pacman -V|base32|head -1</code>' => trim(file_get_contents("{{ archwiki_question_answer_file }}"))
+    'What is the output of: <code>LC_ALL=C pacman -V|sed -r "s#[0-9]+#$(date -u +%m)#g"|base32|head -1</code>' => trim(file_get_contents("{{ archwiki_question_answer_file }}"))
 ];
 
 # Restrict expensive actions to logged in users

roles/archwiki/templates/archwiki-question-updater.hook.j2

-[Trigger]
-Operation = Install
-Operation = Upgrade
-Type = Package
-Target = pacman
-
-[Action]
-When = PostTransaction
-Exec = /usr/bin/systemctl start archwiki-question-updater.service

roles/archwiki/templates/archwiki-question-updater.service.j2

@@ -3,4 +3,5 @@ Description=Update Archwiki pacman question answer
 
 [Service]
 Type=oneshot
-ExecStart=/bin/bash -c 'pacman -V|base32|head -1 > "{{archwiki_question_answer_file}}"'
+# %% is needed here to escape systemd's own templating
+ExecStart=/bin/bash -c 'LC_ALL=C pacman -V|sed -r "s#[0-9]+#$(date -u +%%m)#g"|base32|head -1 > "{{archwiki_question_answer_file}}"'

roles/archwiki/templates/archwiki-question-updater.timer.j2

+[Unit]
+Description=Monthly Timer to update the Archwiki pacman question
+
+[Timer]
+OnCalendar=*-*-1 00:00:00
+Persistent=true
+
+[Install]
+WantedBy=timers.target

roles/matrix/tasks/main.yml

@@ -78,7 +78,7 @@
 - name: Install synapse
   pip:
     name:
-      - 'matrix-synapse[postgres,oidc,systemd,url-preview,redis,user-search]==1.101.0'
+      - 'matrix-synapse[postgres,oidc,systemd,url-preview,redis,user-search]==1.102.0'
     state: latest
     extra_args: '--upgrade-strategy=eager'
     virtualenv: /var/lib/synapse/venv