From 429487b663b231dfc3a68c3f714db9fd663ace8d Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Tue, 3 Jun 2014 17:49:56 +0000 Subject: [PATCH] Add web.conf --- roles/koji_hub/tasks/main.yml | 2 +- roles/koji_hub/templates/web.conf.j2 | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 roles/koji_hub/templates/web.conf.j2 diff --git a/roles/koji_hub/tasks/main.yml b/roles/koji_hub/tasks/main.yml index 3e0405d0cc..5e1e7cdd74 100644 --- a/roles/koji_hub/tasks/main.yml +++ b/roles/koji_hub/tasks/main.yml @@ -32,7 +32,7 @@ notify: restart httpd - name: kojiweb config - template: src=hub.conf.j2 dest=/etc/koji-hub/hub.conf owner=apache group=apache mode=600 + template: src=web.conf.j2 dest=/etc/kojiweb/web.conf owner=apache group=apache mode=600 tags: - config notify: restart httpd diff --git a/roles/koji_hub/templates/web.conf.j2 b/roles/koji_hub/templates/web.conf.j2 new file mode 100644 index 0000000000..0509d67f3b --- /dev/null +++ b/roles/koji_hub/templates/web.conf.j2 @@ -0,0 +1,26 @@ +[web] +SiteName = koji +#KojiTheme = mytheme + +# Key urls +{% if env == 'staging' %} +KojiHubURL = http://koji.stg.fedoraproject.org/kojihub +KojiFilesURL = https://kojipkgs.stg.fedoraproject.org/ +{% else %} +KojiHubURL = http://koji.fedoraproject.org/kojihub +KojiFilesURL = https://kojipkgs.fedoraproject.org/ +{% endif %} + +# SSL authentication options +WebCert = /etc/pki/tls/private/kojiweb_cert_key.pem +ClientCA = /etc/pki/tls/certs/upload_cacert.pem +KojiHubCA = /etc/pki/tls/certs/extras_cacert.pem + + +LoginTimeout = 72 + +# This must be changed and uncommented before deployment +Secret = {{ kojiSecret }} + +LibPath = /usr/share/koji-web/lib +