From a5c1feef0f5bf406dd17a20e436b6fcbdb48636d Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Thu, 7 Oct 2021 18:44:17 +0000 Subject: [PATCH] Add ptgbot serveralias for redirecting PTG site While under development, the subdomain for the PTG site was originally written as ptgbot.opendev.org and this is what was communicated to event organizers. Mass communications subsequently went out including this for URLs to the service. In order to make the content from those announcements viable, add the additional name to our configuration so we can redirect from it to the name we eventually settled on. While we're adjusting vhost metadata, make the ServerAdmin directives between the HTTP and HTTPS vhosts for the service consistent. Change-Id: I726069f83b792fa31d92b759adc5c1214ca087fa --- inventory/service/host_vars/eavesdrop01.opendev.org.yaml | 1 + playbooks/roles/ptgbot/templates/ptgbot.vhost.config.j2 | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/inventory/service/host_vars/eavesdrop01.opendev.org.yaml b/inventory/service/host_vars/eavesdrop01.opendev.org.yaml index 875d45aa7b..16b76bffb0 100644 --- a/inventory/service/host_vars/eavesdrop01.opendev.org.yaml +++ b/inventory/service/host_vars/eavesdrop01.opendev.org.yaml @@ -4,3 +4,4 @@ letsencrypt_certs: ptg-opendev-org-main: - ptg.opendev.org - ptg.openstack.org + - ptgbot.opendev.org diff --git a/playbooks/roles/ptgbot/templates/ptgbot.vhost.config.j2 b/playbooks/roles/ptgbot/templates/ptgbot.vhost.config.j2 index ce77286a91..ed20d2376d 100644 --- a/playbooks/roles/ptgbot/templates/ptgbot.vhost.config.j2 +++ b/playbooks/roles/ptgbot/templates/ptgbot.vhost.config.j2 @@ -1,6 +1,7 @@ ServerName ptg.opendev.org ServerAlias ptg.openstack.org + ServerAlias ptgbot.opendev.org ServerAdmin infra-root@openstack.org ErrorLog ${APACHE_LOG_DIR}/ptg-error.log @@ -16,7 +17,8 @@ ServerName ptg.opendev.org ServerAlias ptg.openstack.org - ServerAdmin webmaster@openstack.org + ServerAlias ptgbot.opendev.org + ServerAdmin infra-root@openstack.org RewriteEngine On RewriteCond %{HTTP_HOST} !^ptg\.opendev\.org [nocase]