diff --git a/roles/distgit/tasks/main.yml b/roles/distgit/tasks/main.yml index b00b3f4b5b..49e682521d 100644 --- a/roles/distgit/tasks/main.yml +++ b/roles/distgit/tasks/main.yml @@ -26,7 +26,7 @@ - distgit - name: install the http push configuration - copy: src=httppush.conf dest=/etc/httpd/conf.d/httpush.conf + template: src=httppush.conf dest=/etc/httpd/conf.d/httpush.conf notify: - reload httpd tags: diff --git a/roles/distgit/files/httppush.conf b/roles/distgit/templates/httppush.conf similarity index 95% rename from roles/distgit/files/httppush.conf rename to roles/distgit/templates/httppush.conf index f4a118deaf..85db728085 100644 --- a/roles/distgit/files/httppush.conf +++ b/roles/distgit/templates/httppush.conf @@ -1,8 +1,3 @@ -SetEnv GIT_PROJECT_ROOT /srv/git/repositories - -AliasMatch ^/(.*/objects/[0-9a-f]{2}/[0-9a-f]{38})$ /srv/git/repositories/$1 -AliasMatch ^/(.*/objects/pack/pack-[0-9a-f]{40}.(pack|idx))$ /srv/git/repositories/$1 - AuthType oauth20 Require all granted @@ -22,6 +17,12 @@ AliasMatch ^/(.*/objects/pack/pack-[0-9a-f]{40}.(pack|idx))$ /srv/git/repositori +{% if env == "production" %} +SetEnv GIT_PROJECT_ROOT /srv/git/repositories + +AliasMatch ^/(.*/objects/[0-9a-f]{2}/[0-9a-f]{38})$ /srv/git/repositories/$1 +AliasMatch ^/(.*/objects/pack/pack-[0-9a-f]{40}.(pack|idx))$ /srv/git/repositories/$1 + SuexecUserGroup pagure packager ScriptAliasMatch \ @@ -30,3 +31,4 @@ ScriptAliasMatch \ objects/info/[^/]+ | \ git-(upload|receive)-pack))$" \ /var/www/bin/gitolite-suexec-wrapper.sh/ +{% endif %}