From 833af2bc2e6c49bc0f8832f595dbc70124799553 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Tue, 9 Jun 2020 19:37:52 +0200 Subject: [PATCH] Replace hardcoded phx2 with datacenter fir sigul server conf Signed-off-by: Patrick Uiterwijk --- roles/sigul/bridge/templates/bridge.conf.j2 | 2 +- roles/sigul/server/templates/server.conf.j2 | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/sigul/bridge/templates/bridge.conf.j2 b/roles/sigul/bridge/templates/bridge.conf.j2 index 7b47afcabc..61245390b3 100644 --- a/roles/sigul/bridge/templates/bridge.conf.j2 +++ b/roles/sigul/bridge/templates/bridge.conf.j2 @@ -2,7 +2,7 @@ # [bridge] # Nickname of the bridge's certificate in the NSS database specified below -bridge-cert-nickname: sign-bridge{{ env_suffix }}.phx2.fedoraproject.org +bridge-cert-nickname: sign-bridge{{ env_suffix }}.{{datacenter}}.fedoraproject.org # Maximum accepted total size of all RPM payloads stored on disk for one request max-rpms-payload-size: 70737418240 diff --git a/roles/sigul/server/templates/server.conf.j2 b/roles/sigul/server/templates/server.conf.j2 index ac4fe81896..7f89070982 100644 --- a/roles/sigul/server/templates/server.conf.j2 +++ b/roles/sigul/server/templates/server.conf.j2 @@ -4,11 +4,11 @@ # Host name of the publically acessible bridge to clients {% if env == "production" %} -bridge-hostname: sign-bridge.phx2.fedoraproject.org +bridge-hostname: sign-bridge.{{datacenter}}.fedoraproject.org {% else %} -bridge-hostname: sign-bridge01.stg.phx2.fedoraproject.org +bridge-hostname: sign-bridge01.stg.{{datacenter}}.fedoraproject.org {% endif %} -server-cert-nickname: sign-vault{{ env_suffix }}.phx2.fedoraproject.org +server-cert-nickname: sign-vault{{ env_suffix }}.{{datacenter}}.fedoraproject.org # Port on which the bridge expects server connections bridge-port: 44333