From ae33c9d0d4325da3def2a654e41552ddd9e7f82a Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Wed, 24 Sep 2025 14:01:00 +0200
Subject: [PATCH] copr: define cgit_uri template variable

And provide updated httpd/conf.d/cgit.conf.
---
 inventory/group_vars/copr_all_instances_aws              | 1 +
 roles/copr/base/templates/copr_nrpe.cfg                  | 2 +-
 roles/copr/dist_git/tasks/main.yml                       | 9 ++++++---
 .../anubis_config.env => templates/anubis_config.env.j2} | 2 +-
 roles/copr/dist_git/templates/cgit.conf.j2               | 5 +++++
 roles/copr/dist_git/templates/ssl.conf.j2                | 4 ++--
 roles/copr/frontend/templates/copr.conf                  | 2 +-
 7 files changed, 17 insertions(+), 8 deletions(-)
 rename roles/copr/dist_git/{files/anubis_config.env => templates/anubis_config.env.j2} (63%)
 create mode 100644 roles/copr/dist_git/templates/cgit.conf.j2

diff --git a/inventory/group_vars/copr_all_instances_aws b/inventory/group_vars/copr_all_instances_aws
index 40e9ccccb6..df6778feda 100644
--- a/inventory/group_vars/copr_all_instances_aws
+++ b/inventory/group_vars/copr_all_instances_aws
@@ -15,3 +15,4 @@ additional_known_hosts_cleanup:
 
 aws_ipv6_con: "cloud-init ens5"
 freezes: false
+cgit_uri: packages
diff --git a/roles/copr/base/templates/copr_nrpe.cfg b/roles/copr/base/templates/copr_nrpe.cfg
index a8e66c8759..9169572c2a 100644
--- a/roles/copr/base/templates/copr_nrpe.cfg
+++ b/roles/copr/base/templates/copr_nrpe.cfg
@@ -1,5 +1,5 @@
 command[check_copr_ping]=/usr/bin/copr-ping-check.py
 command[check_copr_cdn]=/usr/bin/copr-cdn-check.py
 command[check_copr_backend]=/usr/lib64/nagios/plugins/check_http -H copr-be.aws.fedoraproject.org --ssl
-command[check_copr_distgit]=/usr/lib64/nagios/plugins/check_http -w 30 -c 40 --ssl --sni -H copr-dist-git.fedorainfracloud.org -u '/packages/' -s 'Git repository browser'
+command[check_copr_distgit]=/usr/lib64/nagios/plugins/check_http -w 30 -c 40 --ssl --sni -H copr-dist-git.fedorainfracloud.org -u '/{{ cgit_uri }}/' -s 'Git repository browser'
 command[check_copr_frontend]=/usr/lib64/nagios/plugins/check_http -w 30 -c 40 --ssl --sni -H copr.fedorainfracloud.org -u '/' -s 'Copr hosts'
diff --git a/roles/copr/dist_git/tasks/main.yml b/roles/copr/dist_git/tasks/main.yml
index f136434b55..6b938919b2 100644
--- a/roles/copr/dist_git/tasks/main.yml
+++ b/roles/copr/dist_git/tasks/main.yml
@@ -79,7 +79,10 @@
   - Reload httpd
 
 - name: Install /etc/httpd/conf.d/ssl.conf
-  ansible.builtin.template: src="ssl.conf.j2" dest="/etc/httpd/conf.d/ssl.conf" owner=root group=root mode=0644
+  ansible.builtin.template: src="{{ item }}.j2" dest="/etc/httpd/conf.d/{{ item }}" owner=root group=root mode=0644
+  with_items:
+    - ssl.conf
+    - cgit.conf
   notify:
   - Reload httpd
 
@@ -183,8 +186,8 @@
     - anubis
 
 - name: Temporary rewrite Anubis config file
-  ansible.builtin.copy:
-    src: "anubis_config.env"
+  ansible.builtin.template:
+    src: "anubis_config.env.j2"
     dest: "/etc/anubis/default.env"
     mode: '0644'
 
diff --git a/roles/copr/dist_git/files/anubis_config.env b/roles/copr/dist_git/templates/anubis_config.env.j2
similarity index 63%
rename from roles/copr/dist_git/files/anubis_config.env
rename to roles/copr/dist_git/templates/anubis_config.env.j2
index 9396b0a0ba..cfc23b1e3a 100644
--- a/roles/copr/dist_git/files/anubis_config.env
+++ b/roles/copr/dist_git/templates/anubis_config.env.j2
@@ -1,3 +1,3 @@
 BIND="127.0.0.1:8987"
 TARGET="http://127.0.0.1:8345"
-BASE_PREFIX="/packages"
+BASE_PREFIX="/{{ cgit_uri }}"
diff --git a/roles/copr/dist_git/templates/cgit.conf.j2 b/roles/copr/dist_git/templates/cgit.conf.j2
new file mode 100644
index 0000000000..c6b18859bb
--- /dev/null
+++ b/roles/copr/dist_git/templates/cgit.conf.j2
@@ -0,0 +1,5 @@
+Alias /cgit-data /usr/share/cgit
+ScriptAlias /{{ cgit_uri }} /var/www/cgi-bin/cgit
+<Directory "/usr/share/cgit">
+    Require all granted
+</Directory>
diff --git a/roles/copr/dist_git/templates/ssl.conf.j2 b/roles/copr/dist_git/templates/ssl.conf.j2
index 6c9bdb743e..8bc6075b19 100644
--- a/roles/copr/dist_git/templates/ssl.conf.j2
+++ b/roles/copr/dist_git/templates/ssl.conf.j2
@@ -34,8 +34,8 @@ SSLCryptoDevice builtin
     RequestHeader set "X-Http-Version" "%{SERVER_PROTOCOL}s"
 
     # BIND port
-    ProxyPass /packages/ http://localhost:8987/packages/
-    ProxyPassReverse /packages/ http://localhost:8987/packages/
+    ProxyPass /{{ cgit_uri }}/ http://localhost:8987/{{ cgit_uri }}/
+    ProxyPassReverse /{{ cgit_uri }}/ http://localhost:8987/{{ cgit_uri }}/
 
     <FilesMatch "\.(cgi|shtml|phtml|php)$">
         SSLOptions +StdEnvVars
diff --git a/roles/copr/frontend/templates/copr.conf b/roles/copr/frontend/templates/copr.conf
index 2efbb6cefe..c21d2592a1 100644
--- a/roles/copr/frontend/templates/copr.conf
+++ b/roles/copr/frontend/templates/copr.conf
@@ -105,7 +105,7 @@ ENFORCE_PROTOCOL_FOR_BACKEND_URL = "https"
 ENFORCE_PROTOCOL_FOR_FRONTEND_URL = "https"
 {% endif %}
 
-DIST_GIT_URL="https://{{ dist_git_base_url }}/packages"
+DIST_GIT_URL="https://{{ dist_git_base_url }}/{{ cgit_uri }}"
 DIST_GIT_CLONE_URL="https://{{ dist_git_base_url }}/git"
 COPR_DIST_GIT_LOGS_URL = "https://{{ dist_git_base_url }}/per-task-logs"