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

Secondary-bridge can proxy on secondary hubs

Browse source 
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
This commit is contained in:
Patrick Uiterwijk 2016-12-19 02:51:49 +00:00
parent 1bb27419cb
commit 192fb8d7bc
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
roles/koji_hub/templates/hub.conf.j2
View file

@ -7,18 +7,26 @@ DBUser = koji
DBHost = db-koji01 DBHost = db-koji01
DBPass = {{ kojiPassword }} DBPass = {{ kojiPassword }}
AuthPrincipal = host/koji{{env_suffix}}.fedoraproject.org AuthPrincipal = host/koji{{env_suffix}}.fedoraproject.org
{% if env == "staging" %}
ProxyPrincipals = modularity@STG.FEDORAPROJECT.ORG,HTTP/koji.stg.fedoraproject.org@STG.FEDORAPROJECT.ORG
{% else %}
ProxyPrincipals = HTTP/koji.fedoraproject.org@FEDORAPROJECT.ORG,sigul/sign-bridge01.phx2.fedoraproject.org@FEDORAPROJECT.ORG
{% endif %}
{% elif inventory_hostname == 's390-koji01.s390.fedoraproject.org' %} {% elif inventory_hostname == 's390-koji01.s390.fedoraproject.org' %}
DBHost = db-s390-koji01.s390.fedoraproject.org DBHost = db-s390-koji01.s390.fedoraproject.org
DBPass = {{ s390kojiPassword }} DBPass = {{ s390kojiPassword }}
AuthPrincipal = host/s390.koji.fedoraproject.org AuthPrincipal = host/s390.koji.fedoraproject.org
ProxyPrincipals = HTTP/koji.fedoraproject.org@FEDORAPROJECT.ORG,sigul/secondary-bridge01.phx2.fedoraproject.org@FEDORAPROJECT.ORG
{% elif inventory_hostname == 'arm-koji01.qa.fedoraproject.org' %} {% elif inventory_hostname == 'arm-koji01.qa.fedoraproject.org' %}
DBHost = db-arm-koji01.qa.fedoraproject.org DBHost = db-arm-koji01.qa.fedoraproject.org
DBPass = {{ armkojiPassword }} DBPass = {{ armkojiPassword }}
AuthPrincipal = host/arm.koji.fedoraproject.org AuthPrincipal = host/arm.koji.fedoraproject.org
ProxyPrincipals = HTTP/koji.fedoraproject.org@FEDORAPROJECT.ORG,sigul/secondary-bridge01.phx2.fedoraproject.org@FEDORAPROJECT.ORG
{% elif inventory_hostname == 'ppc-koji01.ppc.fedoraproject.org' %} {% elif inventory_hostname == 'ppc-koji01.ppc.fedoraproject.org' %}
DBHost = db-ppc-koji01.ppc.fedoraproject.org DBHost = db-ppc-koji01.ppc.fedoraproject.org
DBPass = {{ ppckojiPassword }} DBPass = {{ ppckojiPassword }}
AuthPrincipal = host/ppc.koji.fedoraproject.org AuthPrincipal = host/ppc.koji.fedoraproject.org
ProxyPrincipals = HTTP/koji.fedoraproject.org@FEDORAPROJECT.ORG,sigul/secondary-bridge01.phx2.fedoraproject.org@FEDORAPROJECT.ORG
{% endif %} {% endif %}
KojiDir = /mnt/koji KojiDir = /mnt/koji
MemoryWarnThreshold = 10000 MemoryWarnThreshold = 10000
@ -31,11 +39,6 @@ HostPrincipalFormat = compile/%s@STG.FEDORAPROJECT.ORG
HostPrincipalFormat = compile/%s@FEDORAPROJECT.ORG HostPrincipalFormat = compile/%s@FEDORAPROJECT.ORG
{% endif %} {% endif %}
AuthKeytab = /etc/koji-hub/koji-hub.keytab AuthKeytab = /etc/koji-hub/koji-hub.keytab
{% if env == "staging" %}
ProxyPrincipals = modularity@STG.FEDORAPROJECT.ORG,HTTP/koji.stg.fedoraproject.org@STG.FEDORAPROJECT.ORG
{% else %}
ProxyPrincipals = HTTP/koji.fedoraproject.org@FEDORAPROJECT.ORG,sigul/sign-bridge01.phx2.fedoraproject.org@FEDORAPROJECT.ORG
{% endif %}
## SSL client certificate auth configuration ## ## SSL client certificate auth configuration ##
#note: ssl auth may also require editing the httpd config (conf.d/kojihub.conf) #note: ssl auth may also require editing the httpd config (conf.d/kojihub.conf)