diff --git a/roles/distgit/pagure/templates/z_pagure.conf b/roles/distgit/pagure/templates/z_pagure.conf index df2470d6ae..c6342a6093 100644 --- a/roles/distgit/pagure/templates/z_pagure.conf +++ b/roles/distgit/pagure/templates/z_pagure.conf @@ -19,31 +19,8 @@ WSGIDaemonProcess pagureproc user=pagure group=packager maximum-requests=1000 di Alias /static /usr/lib/python2.7/site-packages/pagure/static/ Alias /grokmirror /srv/git/grokmirror -{% if env != "staging" %} - 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 - ScriptAliasMatch \ - "(?x)^/(.*/(HEAD | \ - info/refs | \ - objects/info/[^/]+ | \ - git-(upload|receive)-pack))$" \ - /usr/libexec/git-core/git-http-backend/$1 -{% endif %} WSGIProcessGroup pagureproc -{% if env != "staging" %} - - # Apache 2.4 - Require all granted - - - # Apache 2.2 - Order deny,allow - Allow from all - -{% endif %} # diff --git a/roles/distgit/tasks/main.yml b/roles/distgit/tasks/main.yml index 30ad1015e5..7a3d9a635d 100644 --- a/roles/distgit/tasks/main.yml +++ b/roles/distgit/tasks/main.yml @@ -14,22 +14,16 @@ - mod_auth_gssapi - python-fedmsg-genacls - /usr/sbin/semanage + - mod_auth_openidc tags: - distgit -- name: install stg packages - package: name=mod_auth_openidc state=present - tags: - - distgit - when: env == "staging" - - name: install the mod_auth_openidc configuration template: src=auth_openidc.conf dest=/etc/httpd/conf.d/auth_openidc.conf notify: - reload httpd tags: - distgit - when: env == "staging" - name: install the http push configuration copy: src=htpppush.conf dest=/etc/httpd/conf.d/htppush.conf @@ -37,13 +31,11 @@ - reload httpd tags: - distgit - when: env == "staging" - name: Create suexec wrapper directory file: path=/var/www/bin state=directory owner=pagure group=packager tags: - distgit - when: env == "staging" - name: Install suexec wrapper copy: @@ -53,7 +45,6 @@ group=packager tags: - distgit - when: env == "staging" - name: Put in git service config copy: src=git@.service dest=/etc/systemd/system/git@.service