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

Add in ppc hub and db config.

Browse source
This commit is contained in:
Kevin Fenzi 2016-05-20 14:40:24 +00:00
parent 13318ddc69
commit d0b27911ec
4 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
roles/hosts/files/ppc-koji01.ppc.fedoraproject.org-hosts Normal file
View file

@ -0,0 +1,4 @@
127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4
::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
10.5.126.23 infrastructure.fedoraproject.org
10.5.129.241 db-ppc-koji01.ppc.fedoraproject.org db-ppc-koji01

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

@ -12,6 +12,9 @@ DBPass = {{ s390kojiPassword }}
{% elif inventory_hostname == 'arm-koji01.qa.fedoraproject.org' %}
DBHost = db-arm-koji01
DBPass = {{ armkojiPassword }}
{% elif inventory_hostname == 'ppc-koji01.ppc.fedoraproject.org' %}
DBHost = db-ppc-koji01
DBPass = {{ ppckojiPassword }}
{% endif %}
KojiDir = /mnt/koji
MemoryWarnThreshold = 10000
@ -29,6 +32,8 @@ ProxyDNs = emailAddress=buildsys@fedoraproject.org,CN=kojiweb,OU=Fedora Builders
ProxyDNs = /C=US/ST=North Carolina/O=Fedora Project/OU=Fedora Builders/CN=s390.koji.fedoraproject.org/emailAddress=buildsys@fedoraproject.org|emailAddress=buildsys@fedoraproject.org,CN=secondary-signer,OU=Fedora Builders,O=Fedora Project,ST=North Carolina,C=US
{% elif inventory_hostname == 'arm-koji01.qa.fedoraproject.org' %}
ProxyDNs = /C=US/ST=North Carolina/O=Fedora Project/OU=Fedora Builders/CN=arm.koji.fedoraproject.org/emailAddress=buildsys@fedoraproject.org|emailAddress=buildsys@fedoraproject.org,CN=secondary-signer,OU=Fedora Builders,O=Fedora Project,ST=North Carolina,C=US
{% elif inventory_hostname == 'ppc-koji01.ppc.fedoraproject.org' %}
ProxyDNs = /C=US/ST=North Carolina/O=Fedora Project/OU=Buildsys/CN=ppc.koji.fedoraproject.org/emailAddress=ppc@fedoraproject.org|/C=US/ST=North Carolina/O=Fedora Project/OU=Fedora Builders/CN=secondary-signer/emailAddress=buildsys@fedoraproject.org
{% endif %}
## end SSL client certificate auth configuration
@ -43,6 +48,8 @@ KojiWebURL = http://koji.fedoraproject.org/koji
KojiWebURL = http://s390.koji.fedoraproject.org/koji
{% elif inventory_hostname == 'arm-koji01.qa.fedoraproject.org' %}
KojiWebURL = http://arm.koji.fedoraproject.org/koji
{% elif inventory_hostname == 'ppc-koji01.ppc.fedoraproject.org' %}
KojiWebURL = http://ppc.koji.fedoraproject.org/koji
{% endif %}
# The domain name that will be appended to Koji usernames
# when creating email notifications

3
roles/koji_hub/templates/kojiweb.conf.j2
View file

@ -93,5 +93,8 @@ Alias /packages "/mnt/koji/packages/"
{% elif inventory_hostname == 'arm-koji01.qa.fedoraproject.org' %}
#RewriteRule ^/compose(.+) http://arm.koji.fedoraproject.org/compose$1 [R=301,L]
#RewriteRule ^/packages(.+) http://arm.koji.fedoraproject.org/packages$1 [R=301,L]
{% elif inventory_hostname == 'ppc-koji01.ppc.fedoraproject.org' %}
#RewriteRule ^/compose(.+) http://ppc.koji.fedoraproject.org/compose$1 [R=301,L]
#RewriteRule ^/packages(.+) http://ppc.koji.fedoraproject.org/packages$1 [R=301,L]
{% endif %}
{% endif %}

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

@ -12,6 +12,9 @@ KojiFilesURL = http://s390.koji.fedoraproject.org/kojifiles
{% elif inventory_hostname == 'arm-koji01.qa.fedoraproject.org' %}
KojiHubURL = http://arm.koji.fedoraproject.org/kojihub
KojiFilesURL = http://arm.koji.fedoraproject.org/kojifiles
{% elif inventory_hostname == 'ppc-koji01.ppc.fedoraproject.org' %}
KojiHubURL = http://ppc.koji.fedoraproject.org/kojihub
KojiFilesURL = http://ppc.koji.fedoraproject.org/kojifiles
{% else %}
KojiHubURL = http://koji.fedoraproject.org/kojihub
KojiFilesURL = https://kojipkgs.fedoraproject.org/