diff --git a/roles/aurweb/defaults/main.yml b/roles/aurweb/defaults/main.yml index 7ff6f29a7ed95c0b38b274a02e82998df6e1d5a5..1ccc6d7c1cbbbcf61d5cf30c7234e8146deb3e3a 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 f7510a8687ffb0c0a6084b4e8ac3d0361500c7e8..6e4dd90256103a60942b025acd74a9e9a57729bd 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 c22b99e1ab15befcac5fef320da22bf82f816381..99e45fdaa853a2f2e31f85313fbfa3e6bd419b59 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 1fb955c6e5126b877f400c157f1485258e1ea502..75f3969bfca48381efcdd3b546d0ab26633f93b2 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; } #