diff --git a/inventory/group_vars/copr b/inventory/group_vars/copr index 03413336ed..ded725c5bc 100644 --- a/inventory/group_vars/copr +++ b/inventory/group_vars/copr @@ -11,3 +11,5 @@ resolvconf: "resolv.conf/cloud" backend_base_url: "https://copr-be.cloud.fedoraproject.org" postfix_maincf: "postfix/main.cf/main.cf.copr" + +frontend_base_url: "https://copr.fedoraproject.org" diff --git a/inventory/group_vars/copr-stg b/inventory/group_vars/copr-stg index 16495c35e2..179b59a6ba 100644 --- a/inventory/group_vars/copr-stg +++ b/inventory/group_vars/copr-stg @@ -12,3 +12,5 @@ resolvconf: "resolv.conf/cloud" backend_base_url: "http://copr-be-dev.cloud.fedoraproject.org" postfix_maincf: "postfix/main.cf/main.cf.copr" + +frontend_base_url: "http://copr-fe-dev.cloud.fedoraproject.org" diff --git a/roles/copr/dist_git/tasks/main.yml b/roles/copr/dist_git/tasks/main.yml index cd64c0ef0b..ab196d2d03 100644 --- a/roles/copr/dist_git/tasks/main.yml +++ b/roles/copr/dist_git/tasks/main.yml @@ -43,6 +43,9 @@ authorized_key: user="copr-dist-git" key="{{pubkey}}" key_options="command=\"HOME=/var/lib/dist-git/git/ /usr/share/gitolite3/gitolite-shell $USER \"'" ## keys done +- name: install config for copr-dist-git + template: src=copr-dist-git.conf.j2 dest=/etc/copr/copr-dist-git.conf + - name: install config for httpd to serve lookaside openly copy: src="httpd/lookaside.conf" dest="/etc/httpd/conf.d/dist-git/lookaside.conf" tags: diff --git a/roles/copr/dist_git/templates/copr-dist-git.conf.j2 b/roles/copr/dist_git/templates/copr-dist-git.conf.j2 new file mode 100644 index 0000000000..a6b806aadb --- /dev/null +++ b/roles/copr/dist_git/templates/copr-dist-git.conf.j2 @@ -0,0 +1,8 @@ +[dist-git] + +# default is http://coprs/rest/api +frontend_base_url={{frontend_base_url}} + +# must have same value as BACKEND_PASSWORD from have frontend in /etc/copr/copr.conf +# default is PASSWORDHERE but you really should change it. really. +frontend_auth={{ copr_backend_password }}