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

Update sigul config

Browse source 
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
This commit is contained in:
Patrick Uiterwijk 2018-08-18 11:34:23 +00:00
parent 7797e5ba42
commit b8ce5b232d
5 changed files with 2 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

22
roles/sigul/bridge/files/koji-arm.conf
View file

@ -1,22 +0,0 @@
[koji]
realm = FEDORAPROJECT.ORG
;configuration for koji cli tool
;url of XMLRPC server
server = https://arm.koji.fedoraproject.org/kojihub
;url of web interface
weburl = https://arm.koji.fedoraproject.org/koji
;url of package download site
topurl = https://armpkgs.fedoraproject.org/
;path to the koji top directory
;topdir = /mnt/koji
serverca = /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem
authtype = kerberos
principal = sigul/secondary-bridge01.phx2.fedoraproject.org@FEDORAPROJECT.ORG
keytab = /etc/krb5.sigul_secondary-bridge01.phx2.fedoraproject.org.keytab
krb_rdns = false

22
roles/sigul/bridge/files/koji-ppc.conf
View file

@ -1,22 +0,0 @@
[koji]
realm = FEDORAPROJECT.ORG
;configuration for koji cli tool
;url of XMLRPC server
server = https://ppc.koji.fedoraproject.org/kojihub
;url of web interface
weburl = https://ppc.koji.fedoraproject.org/koji
;url of package download site
topurl = https://ppc.koji.fedoraproject.org/
;path to the koji top directory
;topdir = /mnt/koji
serverca = /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem
authtype = kerberos
principal = sigul/secondary-bridge01.phx2.fedoraproject.org@FEDORAPROJECT.ORG
keytab = /etc/krb5.sigul_secondary-bridge01.phx2.fedoraproject.org.keytab
krb_rdns = false

22
roles/sigul/bridge/files/koji-s390.conf
View file

@ -1,22 +0,0 @@
[koji]
realm = FEDORAPROJECT.ORG
;configuration for koji cli tool
;url of XMLRPC server
server = https://s390.koji.fedoraproject.org/kojihub
;url of web interface
weburl = https://s390.koji.fedoraproject.org/koji
;url of package download site
topurl = https://s390pkgs.fedoraproject.org/
;path to the koji top directory
;topdir = /mnt/koji
serverca = /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem
authtype = kerberos
principal = sigul/secondary-bridge01.phx2.fedoraproject.org@FEDORAPROJECT.ORG
keytab = /etc/krb5.sigul_secondary-bridge01.phx2.fedoraproject.org.keytab
krb_rdns = false

13
roles/sigul/bridge/templates/bridge.conf.j2
View file

@ -2,13 +2,7 @@
#
[bridge]
# Nickname of the bridge's certificate in the NSS database specified below
{% if env == "staging" %}
bridge-cert-nickname: sigul-bridge-cert
{% elif inventory_hostname.startswith('sign') %}
bridge-cert-nickname: sign-bridge1 - Fedora Project
{% else %}
bridge-cert-nickname: secondary-signer - Fedora Project
{% endif %}
# Maximum accepted total size of all RPM payloads stored on disk for one request
max-rpms-payload-size: 70737418240
@ -27,16 +21,9 @@ fas-password: {{ fedoraDummyUserPassword }}
{% endif %}
[koji]
{% if inventory_hostname.startswith('sign') %}
koji-instances: primary
koji-config-primary: /etc/koji-primary.conf
koji-config: /etc/koji-primary.conf
{% else %}
koji-instances: ppc s390 arm
koji-config-ppc: /etc/koji-ppc.conf
koji-config-s390: /etc/koji-s390.conf
koji-config-arm: /etc/koji-arm.conf
{% endif %}
[daemon]
# The user to run as

9
roles/sigul/server/templates/server.conf.j2
View file

@ -3,13 +3,8 @@
[server]
# Host name of the publically acessible bridge to clients
{% if inventory_hostname.startswith('sign') %}
bridge-hostname: sign-bridge1
server-cert-nickname: sign-vault1 - Fedora Project
{% else %}
bridge-hostname: secondary-signer
server-cert-nickname: secondary-signer-server
{% endif %}
bridge-hostname: sign-bridge.phx2.fedoraproject.org
server-cert-nickname: sigul-vault-cert
# Port on which the bridge expects server connections
bridge-port: 44333