diff --git a/roles/copr/dist_git/files/httpd/copr-dist-git.conf b/roles/copr/dist_git/files/httpd/copr-dist-git.conf new file mode 100644 index 0000000000..18567dfea8 --- /dev/null +++ b/roles/copr/dist_git/files/httpd/copr-dist-git.conf @@ -0,0 +1,6 @@ +Alias /per-task-logs /var/lib/copr-dist-git/per-task-logs + + Options Indexes FollowSymLinks + AllowOverride None + Require all granted + diff --git a/roles/copr/dist_git/files/httpd/git-smart-http.conf b/roles/copr/dist_git/files/httpd/dist-git/git-smart-http.conf similarity index 100% rename from roles/copr/dist_git/files/httpd/git-smart-http.conf rename to roles/copr/dist_git/files/httpd/dist-git/git-smart-http.conf diff --git a/roles/copr/dist_git/files/httpd/lookaside-copr.conf b/roles/copr/dist_git/files/httpd/dist-git/lookaside-copr.conf similarity index 100% rename from roles/copr/dist_git/files/httpd/lookaside-copr.conf rename to roles/copr/dist_git/files/httpd/dist-git/lookaside-copr.conf diff --git a/roles/copr/dist_git/files/httpd/lookaside.conf b/roles/copr/dist_git/files/httpd/dist-git/lookaside.conf similarity index 100% rename from roles/copr/dist_git/files/httpd/lookaside.conf rename to roles/copr/dist_git/files/httpd/dist-git/lookaside.conf diff --git a/roles/copr/dist_git/tasks/main.yml b/roles/copr/dist_git/tasks/main.yml index f731ec60ed..24229fb7d9 100644 --- a/roles/copr/dist_git/tasks/main.yml +++ b/roles/copr/dist_git/tasks/main.yml @@ -65,7 +65,7 @@ - command: 'git config --global user.name "Copr dist git"' - name: install httpd config to serve lookaside and smart-git - copy: src="httpd/{{ item }}" dest="/etc/httpd/conf.d/dist-git/{{ item }}" + copy: src="httpd/dist-git/{{ item }}" dest="/etc/httpd/conf.d/dist-git/{{ item }}" with_items: - lookaside.conf - lookaside-copr.conf @@ -75,6 +75,17 @@ notify: - reload httpd + +- name: install copr-dist-git httpd config + copy: src="httpd/{{ item }}" dest="/etc/httpd/conf.d/{{ item }}" + with_items: + - copr-dist-git.conf + tags: + - config + notify: + - reload httpd + + - copy: src="dist-git.conf" dest="/etc/dist-git/dist-git.conf" mode=0644 tags: - config