opendev/system-config
Code Issues Proposed changes

Merge "ask.openstack.org static site"

Browse Source
This commit is contained in:
Zuul 2021-05-26 01:05:14 +00:00 committed by Gerrit Code Review
commit 715dda2c8d
8 changed files with 110 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inventory/service/host_vars/static01.opendev.org.yaml
View File

@ -4,6 +4,8 @@ letsencrypt_certs:
- static01.opendev.org - static01.opendev.org
- files.openstack.org - files.openstack.org
- static.openstack.org - static.openstack.org
static01-ask-openstack-org:
- ask.openstack.org
static01-docs-airshipit-org: static01-docs-airshipit-org:
- docs.airshipit.org - docs.airshipit.org
static01-ci-openstack-org: static01-ci-openstack-org:

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

@ -39,6 +39,9 @@
- name: letsencrypt updated static01-opendev-org-main - name: letsencrypt updated static01-opendev-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 static01-ask-openstack-org
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
- name: letsencrypt updated static01-docs-airshipit-org - name: letsencrypt updated static01-docs-airshipit-org
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml

40
playbooks/roles/static/files/50-ask.openstack.org.conf Normal file
View File

@ -0,0 +1,40 @@
<VirtualHost *:80>
ServerName ask.openstack.org
RewriteEngine On
RewriteRule ^/(.*) https://ask.openstack.org/$1 [last,redirect=permanent]
LogLevel warn
ErrorLog /var/log/apache2/ask.openstack.org_error.log
CustomLog /var/log/apache2/ask.openstack.org_access.log combined
ServerSignature Off
</VirtualHost>
<IfModule mod_ssl.c>
<VirtualHost *:443>
ServerName ask.openstack.org
DocumentRoot /var/www/ask.openstack.org
SSLCertificateFile /etc/letsencrypt-certs/ask.openstack.org/ask.openstack.org.cer
SSLCertificateKeyFile /etc/letsencrypt-certs/ask.openstack.org/ask.openstack.org.key
SSLCertificateChainFile /etc/letsencrypt-certs/ask.openstack.org/ca.cer
SSLProtocol All -SSLv2 -SSLv3
# Note: this list should ensure ciphers that provide forward secrecy
SSLCipherSuite ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:!AES256:!aNULL:!eNULL:!MD5:!DSS:!PSK:!SRP
SSLHonorCipherOrder on
Use UserAgentFilter
<Directory /var/www/ask.openstack.org/>
Options Indexes FollowSymLinks MultiViews
AllowOverrideList Redirect RedirectMatch
Require all granted
</Directory>
LogLevel warn
ErrorLog /var/log/apache2/ask.openstack.org_error.log
CustomLog /var/log/apache2/ask.openstack.org_access.log combined
ServerSignature Off
</VirtualHost>
</IfModule>

30
playbooks/roles/static/files/ask.openstack.org/index.html Normal file
View File

@ -0,0 +1,30 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>ask.openstack.org</title>
<meta name="description" content="ask.openstack.org">
</head>
<body>
<h1>ask.openstack.org</h1>
<p>The <tt>ask.openstack.org</tt> site was shutdown in May 2021.</p>
<p>The following options are available for community-based support.</p>
<ul>
<li><a href="http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-discuss">openstack-discuss</a> mailing list.</li>
<li><a href="https://stackoverflow.com/questions/tagged/openstack">stackoverflow.com</a> for code questions.</li>
<li><a href="https://serverfault.com/tags/openstack/info">serverfault.com</a> for operations.</li>
<li>The <a href="https://web.archive.org/web/*/ask.openstack.org">Internet
Archive</a> has archived the site.</li>
</ul>
</body>
</html>

15
playbooks/roles/static/tasks/50-ask.openstack.org.yaml Normal file
View File

@ -0,0 +1,15 @@
- name: Create ask directory
file:
path: /var/www/ask.openstack.org
state: directory
owner: www-data
group: www-data
mode: 0755
- name: Copy ask index.html
copy:
src: 'ask.openstack.org/index.html'
dest: '/var/www/ask.openstack.org/index.html'
owner: www-data
group: www-data
mode: 0644

16
playbooks/roles/static/tasks/enable_site.yaml
View File

@ -1,14 +1,20 @@
- name: Add {{ item }} configuration - name: Check for deployment tasks
include_tasks: "{{ _dt }}"
when: _dt != ""
vars:
_dt: "{{ lookup('first_found', dict(files=[config+'.yaml']), errors='ignore') }}"
- name: Add {{ config }} configuration
copy: copy:
src: '{{ item }}.conf' src: '{{ config }}.conf'
dest: /etc/apache2/sites-available/ dest: /etc/apache2/sites-available/
owner: root owner: root
group: root group: root
mode: 0644 mode: 0644
- name: 'Enable {{ item }}' - name: 'Enable {{ config }}'
command: 'a2ensite {{ item }}' command: 'a2ensite {{ config }}'
args: args:
creates: '/etc/apache2/sites-enabled/{{ item }}' creates: '/etc/apache2/sites-enabled/{{ config }}'
notify: notify:
- Reload apache2 - Reload apache2

3
playbooks/roles/static/tasks/main.yaml
View File

@ -79,6 +79,7 @@
include_tasks: enable_site.yaml include_tasks: enable_site.yaml
loop: loop:
- 00-static.opendev.org - 00-static.opendev.org
- 50-ask.openstack.org
- 50-ci.openstack.org - 50-ci.openstack.org
- 50-cinder.openstack.org - 50-cinder.openstack.org
- 50-developer.openstack.org - 50-developer.openstack.org
@ -102,6 +103,8 @@
- 50-tarballs.opendev.org - 50-tarballs.opendev.org
- 50-tarballs.openstack.org - 50-tarballs.openstack.org
- 50-zuul-ci.org - 50-zuul-ci.org
loop_control:
loop_var: config
- name: Enable git sites - name: Enable git sites
include_tasks: enable_git_site.yaml include_tasks: enable_git_site.yaml

6
testinfra/test_static.py
View File

@ -42,6 +42,12 @@ def test_static_opendev_org(host, name):
(name, name)) (name, name))
assert 'Index of /' in cmd.stdout assert 'Index of /' in cmd.stdout
def test_ask_openstack_org(host):
cmd = host.run('curl --insecure '
'--resolve ask.openstack.org:443:127.0.0.1 '
'https://ask.openstack.org/')
assert 'ask.openstack.org' in cmd.stdout
def test_docs_airshipit_org(host): def test_docs_airshipit_org(host):
cmd = host.run('curl --insecure ' cmd = host.run('curl --insecure '
'--resolve docs.airshipit.org:443:127.0.0.1 ' '--resolve docs.airshipit.org:443:127.0.0.1 '