Remove nginx config tasks from git/web role, make owner discovery recursiveHEADmain

2 files changed, 3 insertions, 20 deletions

diff --git a/git/web/tasks/main.yaml b/git/web/tasks/main.yaml
index 6a33521..1d07e2f 100644
--- a/git/web/tasks/main.yaml
+++ b/git/web/tasks/main.yaml
@@ -41,25 +41,13 @@
 - name: set cgit repo owners
   become: yes
   shell: |
-    for repo in {{cgit_scan_path}}*/; do
-      git config --file "${repo}config" gitweb.owner "{{cgit_owner}}"
+    find {{cgit_scan_path}} -maxdepth 2 -name HEAD -type f | while read headfile; do
+      repodir=$(dirname "$headfile")
+      git config --file "${repodir}/config" gitweb.owner "{{cgit_owner}}"
     done
   when: cgit_owner is defined
   changed_when: true
 
-- name: install cgit nginx site
-  become: yes
-  template: src="cgit.nginx.conf.j2" dest="/etc/nginx/sites-available/cgit.conf"
-  notify: restart nginx
-
-- name: enable cgit nginx site
-  become: yes
-  file:
-    src:  "/etc/nginx/sites-available/cgit.conf"
-    dest: "/etc/nginx/sites-enabled/cgit.conf"
-    state: "link"
-  notify: restart nginx
-
 - name: ensure fcgiwrap service is started
   become: yes
   systemd: name="fcgiwrap.service" enabled="yes" state="started"
diff --git a/git/web/templates/cgit.nginx.conf.j2 b/git/web/templates/cgit.nginx.conf.j2
index 324dd0c..0ddbe38 100644
--- a/git/web/templates/cgit.nginx.conf.j2
+++ b/git/web/templates/cgit.nginx.conf.j2
@@ -25,11 +25,6 @@ server {
 
     root /usr/share/cgit;
 
-    # Redirect old Mercurial-style paths to cgit equivalents
-    rewrite ^/([^/]+)/file/tip/(.*)$ /$1/tree/$2 permanent;
-    rewrite ^/([^/]+)/file/tip$      /$1/tree    permanent;
-    rewrite ^/([^/]+)/file$          /$1/tree    permanent;
-
     try_files $uri @cgit;
 
     location @cgit {