From 722cc5bfae42c1a22ce35810e642a1deed2167e6 Mon Sep 17 00:00:00 2001
From: moson <moson@archlinux.org>
Date: Mon, 2 Oct 2023 14:17:28 +0200
Subject: [PATCH] aurweb: release 6.2.8
* bump version
* services: rename tuvotereminder to votereminder
* nginx: redirect /tu to /package-maintainer
* nginx: remove /trusted-user/TUbylaws.html redirect
Signed-off-by: moson <moson@archlinux.org>
---
roles/aurweb/defaults/main.yml | 6 +++---
...tereminder.service.j2 => aurweb-votereminder.service.j2} | 4 ++--
...tuvotereminder.timer.j2 => aurweb-votereminder.timer.j2} | 2 +-
roles/aurweb/templates/nginx.d.conf.j2 | 5 +++--
4 files changed, 9 insertions(+), 8 deletions(-)
rename roles/aurweb/templates/{aurweb-tuvotereminder.service.j2 => aurweb-votereminder.service.j2} (84%)
rename roles/aurweb/templates/{aurweb-tuvotereminder.timer.j2 => aurweb-votereminder.timer.j2} (64%)
diff --git a/roles/aurweb/defaults/main.yml b/roles/aurweb/defaults/main.yml
index 7ff6f29a7..1ccc6d7c1 100644
--- a/roles/aurweb/defaults/main.yml
+++ b/roles/aurweb/defaults/main.yml
@@ -8,7 +8,7 @@ aurweb_conf_dir: '/etc/aurweb'
aurweb_git_dir: "{{ aurweb_dir }}/aur.git"
aurweb_git_hook: '/usr/local/bin/aurweb-git-update'
aurweb_nginx_conf: '/etc/nginx/nginx.d/aurweb.conf'
-aurweb_version: 'v6.2.7'
+aurweb_version: 'v6.2.8'
aurweb_pgp_keys: ['B4B759625D4633430B74877059E43E106B247368', 'DB650286BD9EAE39890D3FE6FE3DC1668CB24956', 'D5AD89388A7C6C9C22E790994A4760AB4EE15296']
aurweb_db: 'aur'
@@ -36,7 +36,7 @@ aurweb_timers:
- { name: "aurweb-mkpkglists.timer" }
- { name: "aurweb-pkgmaint.timer" }
- { name: "aurweb-popupdate.timer" }
- - { name: "aurweb-tuvotereminder.timer" }
+ - { name: "aurweb-votereminder.timer" }
- { name: "aurweb-usermaint.timer" }
- { name: "aurweb-github-mirror.timer", install: "{{ aurweb_environment_type == 'prod' }}", restart: "{{ aurweb_environment_type == 'prod' }}" }
@@ -46,7 +46,7 @@ aurweb_services:
- { name: "aurweb-mkpkglists.service", restart: false }
- { name: "aurweb-pkgmaint.service", restart: false }
- { name: "aurweb-popupdate.service", restart: false }
- - { name: "aurweb-tuvotereminder.service", restart: false }
+ - { name: "aurweb-votereminder.service", restart: false }
- { name: "aurweb-usermaint.service", restart: false }
- { name: "aurweb-github-mirror.service", install: "{{ aurweb_environment_type == 'prod' }}", restart: false }
- { name: "aurweb.service" }
diff --git a/roles/aurweb/templates/aurweb-tuvotereminder.service.j2 b/roles/aurweb/templates/aurweb-votereminder.service.j2
similarity index 84%
rename from roles/aurweb/templates/aurweb-tuvotereminder.service.j2
rename to roles/aurweb/templates/aurweb-votereminder.service.j2
index f7510a868..6e4dd9025 100644
--- a/roles/aurweb/templates/aurweb-tuvotereminder.service.j2
+++ b/roles/aurweb/templates/aurweb-votereminder.service.j2
@@ -1,5 +1,5 @@
[Unit]
-Description=Send aurweb TU vote reminder emails
+Description=Send aurweb vote reminder emails
Requires=mysqld.service
After=mysqld.service
@@ -7,7 +7,7 @@ After=mysqld.service
Type=oneshot
User={{ aurweb_user }}
WorkingDirectory={{ aurweb_dir }}
-ExecStart=/usr/bin/poetry run aurweb-tuvotereminder
+ExecStart=/usr/bin/poetry run aurweb-votereminder
NoNewPrivileges=true
LockPersonality=true
diff --git a/roles/aurweb/templates/aurweb-tuvotereminder.timer.j2 b/roles/aurweb/templates/aurweb-votereminder.timer.j2
similarity index 64%
rename from roles/aurweb/templates/aurweb-tuvotereminder.timer.j2
rename to roles/aurweb/templates/aurweb-votereminder.timer.j2
index c22b99e1a..99e45fdaa 100644
--- a/roles/aurweb/templates/aurweb-tuvotereminder.timer.j2
+++ b/roles/aurweb/templates/aurweb-votereminder.timer.j2
@@ -1,5 +1,5 @@
[Unit]
-Description=Send aurweb TU vote reminder emails
+Description=Send aurweb vote reminder emails
[Timer]
OnStartupSec=12h
diff --git a/roles/aurweb/templates/nginx.d.conf.j2 b/roles/aurweb/templates/nginx.d.conf.j2
index 1fb955c6e..75f3969bf 100644
--- a/roles/aurweb/templates/nginx.d.conf.j2
+++ b/roles/aurweb/templates/nginx.d.conf.j2
@@ -50,8 +50,9 @@ server {
root {{ aurweb_dir }}/static;
index index.php;
- location = /trusted-user/TUbylaws.html {
- return 301 https://tu-bylaws.aur.archlinux.org;
+ # redirect /tu to /package-maintainer for external links
+ location ~ ^/tu(.*) {
+ return 301 https://aur.archlinux.org/package-maintainer$1;
}
#
--
GitLab