opendev/system-config
Code Issues Proposed changes

Add ptgbot serveralias for redirecting PTG site

Browse Source 
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
This commit is contained in:
Jeremy Stanley 2021-10-07 18:44:17 +00:00
parent ba7d3d59c3
commit a5c1feef0f
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
inventory/service/host_vars/eavesdrop01.opendev.org.yaml
View File

@ -4,3 +4,4 @@ letsencrypt_certs:
ptg-opendev-org-main: ptg-opendev-org-main:
- ptg.opendev.org - ptg.opendev.org
- ptg.openstack.org - ptg.openstack.org
- ptgbot.opendev.org

4
playbooks/roles/ptgbot/templates/ptgbot.vhost.config.j2
View File

@ -1,6 +1,7 @@
<VirtualHost *:80> <VirtualHost *:80>
ServerName ptg.opendev.org ServerName ptg.opendev.org
ServerAlias ptg.openstack.org ServerAlias ptg.openstack.org
ServerAlias ptgbot.opendev.org
ServerAdmin infra-root@openstack.org ServerAdmin infra-root@openstack.org
ErrorLog ${APACHE_LOG_DIR}/ptg-error.log ErrorLog ${APACHE_LOG_DIR}/ptg-error.log
@ -16,7 +17,8 @@
<VirtualHost *:443> <VirtualHost *:443>
ServerName ptg.opendev.org ServerName ptg.opendev.org
ServerAlias ptg.openstack.org ServerAlias ptg.openstack.org
ServerAdmin webmaster@openstack.org ServerAlias ptgbot.opendev.org
ServerAdmin infra-root@openstack.org
RewriteEngine On RewriteEngine On
RewriteCond %{HTTP_HOST} !^ptg\.opendev\.org [nocase] RewriteCond %{HTTP_HOST} !^ptg\.opendev\.org [nocase]