From d0b27911ec459d68719d06f722708399acc1f8cb Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 20 May 2016 14:40:24 +0000 Subject: [PATCH] Add in ppc hub and db config. --- roles/hosts/files/ppc-koji01.ppc.fedoraproject.org-hosts | 4 ++++ roles/koji_hub/templates/hub.conf.j2 | 7 +++++++ roles/koji_hub/templates/kojiweb.conf.j2 | 3 +++ roles/koji_hub/templates/web.conf.j2 | 3 +++ 4 files changed, 17 insertions(+) create mode 100644 roles/hosts/files/ppc-koji01.ppc.fedoraproject.org-hosts diff --git a/roles/hosts/files/ppc-koji01.ppc.fedoraproject.org-hosts b/roles/hosts/files/ppc-koji01.ppc.fedoraproject.org-hosts new file mode 100644 index 0000000000..4c1977f5ec --- /dev/null +++ b/roles/hosts/files/ppc-koji01.ppc.fedoraproject.org-hosts @@ -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 diff --git a/roles/koji_hub/templates/hub.conf.j2 b/roles/koji_hub/templates/hub.conf.j2 index 272e366d36..30916dfa6d 100644 --- a/roles/koji_hub/templates/hub.conf.j2 +++ b/roles/koji_hub/templates/hub.conf.j2 @@ -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 diff --git a/roles/koji_hub/templates/kojiweb.conf.j2 b/roles/koji_hub/templates/kojiweb.conf.j2 index 29b9292a92..4487b96de5 100644 --- a/roles/koji_hub/templates/kojiweb.conf.j2 +++ b/roles/koji_hub/templates/kojiweb.conf.j2 @@ -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 %} diff --git a/roles/koji_hub/templates/web.conf.j2 b/roles/koji_hub/templates/web.conf.j2 index f27f6fff06..f7cbc541b9 100644 --- a/roles/koji_hub/templates/web.conf.j2 +++ b/roles/koji_hub/templates/web.conf.j2 @@ -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/