Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Web UI also needs https

Browse source 
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
This commit is contained in:
Patrick Uiterwijk 2016-12-15 14:38:47 +00:00
parent 1e80910934
commit 5f6642373f
1 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
roles/koji_hub/templates/web.conf.j2
View file

@ -4,28 +4,26 @@ SiteName = koji
# Key urls # Key urls
{% if env == 'staging' %} {% if env == 'staging' %}
KojiHubURL = http://koji.stg.fedoraproject.org/kojihub KojiHubURL = https://koji.stg.fedoraproject.org/kojihub
KojiFilesURL = https://kojipkgs.stg.fedoraproject.org/ KojiFilesURL = https://kojipkgs.stg.fedoraproject.org/
{% elif inventory_hostname == 's390-koji01.s390.fedoraproject.org' %} {% elif inventory_hostname == 's390-koji01.s390.fedoraproject.org' %}
KojiHubURL = http://s390.koji.fedoraproject.org/kojihub KojiHubURL = https://s390.koji.fedoraproject.org/kojihub
KojiFilesURL = http://s390.koji.fedoraproject.org/kojifiles KojiFilesURL = https://s390.koji.fedoraproject.org/kojifiles
{% elif inventory_hostname == 'arm-koji01.qa.fedoraproject.org' %} {% elif inventory_hostname == 'arm-koji01.qa.fedoraproject.org' %}
KojiHubURL = http://arm.koji.fedoraproject.org/kojihub KojiHubURL = https://arm.koji.fedoraproject.org/kojihub
KojiFilesURL = http://arm.koji.fedoraproject.org/kojifiles KojiFilesURL = https://arm.koji.fedoraproject.org/kojifiles
{% elif inventory_hostname == 'ppc-koji01.ppc.fedoraproject.org' %} {% elif inventory_hostname == 'ppc-koji01.ppc.fedoraproject.org' %}
KojiHubURL = http://ppc.koji.fedoraproject.org/kojihub KojiHubURL = https://ppc.koji.fedoraproject.org/kojihub
KojiFilesURL = http://ppc.koji.fedoraproject.org/kojifiles KojiFilesURL = https://ppc.koji.fedoraproject.org/kojifiles
{% else %} {% else %}
KojiHubURL = http://koji.fedoraproject.org/kojihub KojiHubURL = https://koji.fedoraproject.org/kojihub
KojiFilesURL = https://kojipkgs.fedoraproject.org/ KojiFilesURL = https://kojipkgs.fedoraproject.org/
{% endif %} {% endif %}
# SSL authentication options # SSL authentication options
KrbRDNS = False KrbRDNS = False
WebKeytab = /etc/koji-hub-http.keytab WebKeytab = /etc/koji-hub-http.keytab
WebPrincipal = HTTP/koji.{% if env == "staging" %}stg.{% endif %}fedoraproject.org WebPrincipal = HTTP/koji{{env_suffix}}.fedoraproject.org
ClientCA = /etc/pki/tls/certs/upload_cacert.pem
KojiHubCA = /etc/pki/tls/certs/extras_cacert.pem
LoginTimeout = 72 LoginTimeout = 72