opendev/system-config
Code Issues Proposed changes

ptgbot: rename site to ptg.opendev.org

Browse Source 
To remain consistent with "ptg.openstack.org", we are dropping the
"bot"

Depends-On: https://review.opendev.org/c/opendev/zone-opendev.org/+/812757
Change-Id: I5f06ee08241a286178fcb1be5c19fee6b6086d6f
This commit is contained in:
Ian Wienand 2021-10-07 09:21:15 +11:00
parent d48ec532d5
commit 67c08d52ad
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
letsencrypt_certs: letsencrypt_certs:
eavesdrop01-opendev-org-main: eavesdrop01-opendev-org-main:
- eavesdrop01.opendev.org - eavesdrop01.opendev.org
ptgbot-opendev-org-main: ptg-opendev-org-main:
- ptgbot.opendev.org - ptg.opendev.org
- ptg.openstack.org

2
playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
View File

@ -252,7 +252,7 @@
- name: letsencrypt updated translate01-openstack-org-main - name: letsencrypt updated translate01-openstack-org-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
- name: letsencrypt updated ptgbot-opendev-org-main - name: letsencrypt updated ptg-opendev-org-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
# We split out handlers for each gitea host as handlers should be run in order # We split out handlers for each gitea host as handlers should be run in order

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

@ -1,31 +1,31 @@
<VirtualHost *:80> <VirtualHost *:80>
ServerName ptgbot.opendev.org ServerName ptg.opendev.org
ServerAdmin infra-root@openstack.org ServerAdmin infra-root@openstack.org
ErrorLog ${APACHE_LOG_DIR}/ptgbot-error.log ErrorLog ${APACHE_LOG_DIR}/ptg-error.log
LogLevel warn LogLevel warn
CustomLog ${APACHE_LOG_DIR}/ptgbot-access.log combined CustomLog ${APACHE_LOG_DIR}/ptg-access.log combined
Redirect / https://ptgbot.opendev.org/ Redirect / https://ptg.opendev.org/
</VirtualHost> </VirtualHost>
<VirtualHost *:443> <VirtualHost *:443>
ServerName ptgbot.opendev.org ServerName ptg.opendev.org
ServerAdmin webmaster@openstack.org ServerAdmin webmaster@openstack.org
RewriteCond %{HTTP_HOST} !^ptgbot\.opendev\.org [nocase] RewriteCond %{HTTP_HOST} !^ptg\.opendev\.org [nocase]
RewriteRule ^/(.*) https://ptgbot.opendev.org/$1 [last,redirect=permanent] RewriteRule ^/(.*) https://ptg.opendev.org/$1 [last,redirect=permanent]
AllowEncodedSlashes On AllowEncodedSlashes On
ErrorLog ${APACHE_LOG_DIR}/ptgbot-ssl-error.log ErrorLog ${APACHE_LOG_DIR}/ptg-ssl-error.log
LogLevel warn LogLevel warn
CustomLog ${APACHE_LOG_DIR}/ptgbot-ssl-access.log combined CustomLog ${APACHE_LOG_DIR}/ptg-ssl-access.log combined
SSLEngine on SSLEngine on
SSLProtocol All -SSLv2 -SSLv3 SSLProtocol All -SSLv2 -SSLv3
@ -33,9 +33,9 @@
SSLCipherSuite ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:!AES256:!aNULL:!eNULL:!MD5:!DSS:!PSK:!SRP SSLCipherSuite ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:!AES256:!aNULL:!eNULL:!MD5:!DSS:!PSK:!SRP
SSLHonorCipherOrder on SSLHonorCipherOrder on
SSLCertificateFile /etc/letsencrypt-certs/ptgbot.opendev.org/ptgbot.opendev.org.cer SSLCertificateFile /etc/letsencrypt-certs/ptg.opendev.org/ptg.opendev.org.cer
SSLCertificateKeyFile /etc/letsencrypt-certs/ptgbot.opendev.org/ptgbot.opendev.org.key SSLCertificateKeyFile /etc/letsencrypt-certs/ptg.opendev.org/ptg.opendev.org.key
SSLCertificateChainFile /etc/letsencrypt-certs/ptgbot.opendev.org/ca.cer SSLCertificateChainFile /etc/letsencrypt-certs/ptg.opendev.org/ca.cer
ProxyPass / http://localhost:8000/ retry=0 ProxyPass / http://localhost:8000/ retry=0
ProxyPassReverse / http://localhost:8000/ ProxyPassReverse / http://localhost:8000/

4
testinfra/test_eavesdrop.py
View File

@ -48,6 +48,6 @@ def test_statusbot_running(host):
def test_ptgbot(host): def test_ptgbot(host):
cmd = host.run('curl --insecure ' cmd = host.run('curl --insecure '
'--resolve ptgbot.opendev.org:443:127.0.0.1 ' '--resolve ptg.opendev.org:443:127.0.0.1 '
'https://ptgbot.opendev.org/') 'https://ptg.opendev.org/')
assert 'Project Teams Gathering' in cmd.stdout assert 'Project Teams Gathering' in cmd.stdout