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_2022-06-06'
+archweb_version: 'release_2022-08-12'
 archweb_pgp_key: ['E499C79F53C96A54E572FEE1C06086337C50773E']
 archweb_site: true
 archweb_mirrorcheck: false

roles/archwiki/defaults/main.yml

@@ -3,7 +3,7 @@ archwiki_domain: 'wiki.archlinux.org'
 archwiki_nginx_conf: '/etc/nginx/nginx.d/archwiki.conf'
 archwiki_user: 'archwiki'
 archwiki_repository: 'https://github.com/archlinux/archwiki.git'
-archwiki_version: '1.38.1-1'
+archwiki_version: '1.38.2-1'
 archwiki_question_answer_file: '/srv/http/archwiki/registration-question-answer.txt'
 
 archwiki_socket: '/run/php-fpm/archwiki.socket'

roles/aurweb/tasks/main.yml

@@ -177,6 +177,8 @@
   command: poetry install
   args:
     chdir: "{{ aurweb_dir }}"
+  environment:
+    POETRY_VIRTUALENVS_IN_PROJECT: "true"
   become: true
   become_user: "{{ aurweb_user }}"
   when: release.changed or aurweb_installed.rc != 0

roles/aurweb/templates/aurweb-git-auth.sh.j2

 #!/bin/bash
-cd "{{ aurweb_dir }}"
-exec poetry run aurweb-git-auth "$@"
+exec "{{ aurweb_dir }}/.venv/bin/aurweb-git-auth" "$@"

roles/aurweb/templates/aurweb-git-serve.sh.j2

 #!/bin/bash
-cd "{{ aurweb_dir }}"
-exec poetry run aurweb-git-serve "$@"
+exec "{{ aurweb_dir }}/.venv/bin/aurweb-git-serve" "$@"

roles/aurweb/templates/aurweb-github-mirror.service.j2

@@ -2,4 +2,4 @@
 Type=oneshot
 User={{ aurweb_user }}
 WorkingDirectory={{ aurweb_git_dir }}
-ExecStart=git push --all git@github.com:archlinux/aur.git
+ExecStart=git push --force --all git@github.com:archlinux/aur.git

roles/borg_client/defaults/main.yml

@@ -2,10 +2,8 @@ backup_hosts:
   - host: "ssh://u236610.your-storagebox.de:23"
     dir: "~/repo"
     suffix: ""
-    borg_cmd: "borg"
-    compact_after_prune: true
+    borg_cmd: "/usr/bin/borg"
   - host: "ssh://zh1905@zh1905.rsync.net:22"
     dir: "~/backup/{{ inventory_hostname }}"
     suffix: "-offsite"
-    borg_cmd: "borg --remote-path=borg1"
-    compact_after_prune: false # not upgraded to borg 1.2 yet
+    borg_cmd: "/usr/bin/borg --remote-path=borg1"

roles/borg_client/templates/borg-backup.sh.j2

@@ -91,6 +91,4 @@ fi
 
 {{ item['borg_cmd'] }} prune -v {{ item['host'] }}/{{ item['dir'] }} --keep-daily=7 --keep-weekly=4 --keep-monthly=6
 
-{% if item['compact_after_prune'] %}
 {{ item['borg_cmd'] }} compact -v {{ item['host'] }}/{{ item['dir'] }}
-{% endif %}

roles/borg_client/templates/borg.j2

 #!/bin/bash
 
-BORG_REPO="{{ item['host'] }}/{{ item['dir'] }}" exec /usr/bin/{{ item['borg_cmd'] }} "$@"
+BORG_REPO="{{ item['host'] }}/{{ item['dir'] }}" exec {{ item['borg_cmd'] }} "$@"

roles/grafana/files/dashboards/aur.json

@@ -105,7 +105,7 @@
             "uid": "PBFA97CFB590B2093"
           },
           "exemplar": true,
-          "expr": "rate(http_requests_total[5m])",
+          "expr": "rate(http_requests_total{job=\"aurweb\"}[5m])",
           "interval": "",
           "legendFormat": "{{ path }} {{ status }}",
           "refId": "A"

roles/grafana/templates/grafana.ini.j2

@@ -130,7 +130,7 @@ path = ":memory"
 # For "sqlite3" only. cache mode setting used for connecting to the database. (private, shared)
 ;cache_mode = private
 
-# For "mysql" only if lockingMigration feature toggle is set. How many seconds to wait before failing to lock the database for the migrations, default is 0.
+# For "mysql" only if migrationLocking feature toggle is set. How many seconds to wait before failing to lock the database for the migrations, default is 0.
 ;locking_attempt_timeout_sec = 0
 
 ################################### Data sources #########################

roles/install_arch/tasks/main.yml

@@ -81,16 +81,21 @@
   register: chroot_pacman_key_populate
   changed_when: "chroot_pacman_key_populate.rc == 0"
 
-- name: install ucode update for Intel
-  set_fact: ucode="intel-ucode"
-  when: "'GenuineIntel' in ansible_facts['processor']"
-
-- name: install ucode update for AMD
-  set_fact: ucode="amd-ucode"
-  when: "'AuthenticAMD' in ansible_facts['processor']"
+- name: install ucode update
+  block:
+    - name: install ucode update for Intel
+      set_fact: ucode="intel-ucode"
+      when: "'GenuineIntel' in ansible_facts['processor']"
+
+    - name: install ucode update for AMD
+      set_fact: ucode="amd-ucode"
+      when: "'AuthenticAMD' in ansible_facts['processor']"
+  when:
+    - "'hcloud' not in group_names"
+    - inventory_hostname != 'packer-base-image'
 
 - name: install arch base from bootstrap chroot
-  command: chroot /tmp/root.x86_64 pacstrap /mnt base linux btrfs-progs grub openssh python-requests python-yaml inetutils {{ ucode }}
+  command: chroot /tmp/root.x86_64 pacstrap /mnt base linux btrfs-progs grub openssh python-requests python-yaml inetutils {{ ucode | default('') }}
   args:
     creates: /tmp/root.x86_64/mnt/bin
 

roles/mailman3/templates/urls.py.j2

@@ -17,19 +17,19 @@
 # Postorius.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from django.urls import include, path
+from django.conf.urls import include
 from django.contrib import admin
-from django.urls import reverse_lazy
+from django.urls import path, reverse_lazy
 from django.views.generic import RedirectView
 
 urlpatterns = [
-    path('', RedirectView.as_view(
-        url=reverse_lazy('list_index'),
-        permanent=True)),
+    path(
+        '',
+        RedirectView.as_view(url=reverse_lazy('list_index'), permanent=True),
+    ),
     path('mailman3/', include('postorius.urls')),
     path('archives/', include('hyperkitty.urls')),
     path('', include('django_mailman3.urls')),
     path('accounts/', include('allauth.urls')),
-    # Django admin
     path('admin3/', admin.site.urls),
 ]

roles/rebuilderd/templates/nginx.d.conf.j2

@@ -42,19 +42,19 @@ server {
     root {{ rebuilder_website_loc }};
 
     location ~* (css|js|svg)$ {
-           expires 30d;
-           add_header Pragma public;
-           add_header Cache-Control "public, must-revalidate, proxy-revalidate";
+        expires 30d;
+        add_header Pragma public;
+        add_header Cache-Control "public, must-revalidate, proxy-revalidate";
     }
 
     location /api/ {
-            proxy_set_header    X-Real-IP          $remote_addr;
-	    proxy_pass http://127.0.0.1:8484;
+        proxy_set_header    X-Real-IP          $remote_addr;
+        proxy_pass http://127.0.0.1:8484;
     }
 
     location = /api/v0/build/report {
-	    client_max_body_size 25M;
-            proxy_set_header    X-Real-IP          $remote_addr;
-	    proxy_pass http://127.0.0.1:8484;
+        client_max_body_size 200M;
+        proxy_set_header    X-Real-IP          $remote_addr;
+        proxy_pass http://127.0.0.1:8484;
     }
 }

roles/rebuilderd/templates/rebuilderd-sync.conf.j2

@@ -2,32 +2,32 @@
 distro = "archlinux"
 suite = "core"
 architectures = ["x86_64"]
-source = "https://europe.mirror.pkgbuild.com/$repo/os/$arch"
+source = "https://geo.mirror.pkgbuild.com/$repo/os/$arch"
 
 [profile."archlinux-extra"]
 distro = "archlinux"
 suite = "extra"
 architectures = ["x86_64"]
-source = "https://europe.mirror.pkgbuild.com/$repo/os/$arch"
+source = "https://geo.mirror.pkgbuild.com/$repo/os/$arch"
 excludes = [""]
 
 [profile."archlinux-testing"]
 distro = "archlinux"
 suite = "testing"
 architectures = ["x86_64"]
-source = "https://europe.mirror.pkgbuild.com/$repo/os/$arch"
+source = "https://geo.mirror.pkgbuild.com/$repo/os/$arch"
 excludes = [""]
 
 [profile."archlinux-community"]
 distro = "archlinux"
 suite = "community"
 architectures = ["x86_64"]
-source = "https://europe.mirror.pkgbuild.com/$repo/os/$arch"
+source = "https://geo.mirror.pkgbuild.com/$repo/os/$arch"
 excludes = ["cuda*", "tensorflow*", "*pytorch*", "*kube*", "python-tensorflow*"]
 
 [profile."archlinux-community-testing"]
 distro = "archlinux"
 suite = "community-testing"
 architectures = ["x86_64"]
-source = "https://europe.mirror.pkgbuild.com/$repo/os/$arch"
+source = "https://geo.mirror.pkgbuild.com/$repo/os/$arch"
 excludes = ["cuda*", "tensorflow*", "*pytorch*", "*kube*", "python-tensorflow*"]

roles/rebuilderd_worker/files/repro.conf

 NOCHECK=1
 CACHEDIR=/var/lib/rebuilderd-worker/cache
-BOOTSTRAPMIRROR="https://europe.mirror.pkgbuild.com/iso/latest"
-HOSTMIRROR="https://europe.mirror.pkgbuild.com/\$repo/os/\$arch"

tf-stage1/archlinux.tf

@@ -141,6 +141,10 @@ locals {
       server_type = "cx11"
       domain      = "redirect"
     }
+    "repos-git.archlinux.org" = {
+      server_type = "cpx11"
+      domain      = "repos-git"
+    }
     "reproducible.archlinux.org" = {
       server_type = "cx11"
       domain      = "reproducible"
@@ -244,10 +248,6 @@ locals {
   #   ttl          = 3600
   # }
   archlinux_org_a_aaaa = {
-    aur4 = {
-      ipv4_address = "5.9.250.164"
-      ipv6_address = "2a01:4f8:160:3033::2"
-    }
     build = {
       ipv4_address = "135.181.138.48"
       ipv6_address = "2a01:4f9:3a:120f::2"
@@ -623,3 +623,10 @@ resource "hcloud_volume" "debuginfod" {
   server_id         = hcloud_server.machine["debuginfod.archlinux.org"].id
   delete_protection = true
 }
+
+resource "hcloud_volume" "repos-git" {
+  name              = "repos-git"
+  size              = 100
+  server_id         = hcloud_server.machine["repos-git.archlinux.org"].id
+  delete_protection = true
+}