Browse Source

Merge "Add a new docs.airshipit.org vhost on static01"

changes/63/714263/1
Zuul Gerrit Code Review 2 weeks ago
parent
commit
a31bae50a3
4 changed files with 49 additions and 0 deletions
  1. +1
    -0
      playbooks/roles/afs-release/files/release-volumes.py
  2. +41
    -0
      playbooks/roles/static/files/50-docs.airshipit.org.conf
  3. +1
    -0
      playbooks/roles/static/tasks/main.yaml
  4. +6
    -0
      testinfra/test_static.py

+ 1
- 0
playbooks/roles/afs-release/files/release-volumes.py View File

@@ -32,6 +32,7 @@ from datetime import datetime

VOLUMES = ['docs',
'docs.dev',
'project.airship',
'project.governance',
'project.opendev',
'project.releases',


+ 41
- 0
playbooks/roles/static/files/50-docs.airshipit.org.conf View File

@@ -0,0 +1,41 @@
Define AFS_ROOT /afs/openstack.org/project/airshipit.org

<VirtualHost *:80>
ServerName docs.airshipit.org
RewriteEngine On
RewriteRule ^/(.*) https://docs.airshipit.org/$1 [last,redirect=permanent]
LogLevel warn
ErrorLog /var/log/apache2/docs.airshipit.org_error.log
CustomLog /var/log/apache2/docs.airshipit.org_access.log combined
ServerSignature Off
</VirtualHost>

<IfModule mod_ssl.c>
<VirtualHost *:443>

ServerName docs.airshipit.org

DocumentRoot ${AFS_ROOT}/docs

SSLCertificateFile /etc/letsencrypt-certs/docs.airshipit.org/docs.airshipit.org.cer
SSLCertificateKeyFile /etc/letsencrypt-certs/docs.airshipit.org/docs.airshipit.org.key
SSLCertificateChainFile /etc/letsencrypt-certs/docs.airshipit.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

<Directory ${AFS_ROOT}/docs>
Options Indexes FollowSymLinks MultiViews
AllowOverrideList Redirect RedirectMatch
Satisfy Any
Require all granted
</Directory>

LogLevel warn
ErrorLog /var/log/apache2/docs.airshipit.org_error.log
CustomLog /var/log/apache2/docs.airshipit.org_access.log combined
ServerSignature Off

</VirtualHost>
</IfModule>

+ 1
- 0
playbooks/roles/static/tasks/main.yaml View File

@@ -74,6 +74,7 @@
- 50-cinder.openstack.org
- 50-developer.openstack.org
- 50-devstack.org
- 50-docs.airshipit.org
- 50-docs.opendev.org
- 50-docs.openstack.org
- 50-docs.starlingx.io


+ 6
- 0
testinfra/test_static.py View File

@@ -42,6 +42,12 @@ def test_static_opendev_org(host, name):
(name, name))
assert 'Index of /' in cmd.stdout

def test_docs_airshipit_org(host):
cmd = host.run('curl --insecure '
'--resolve docs.airshipit.org:443:127.0.0.1 '
'https://docs.airshipit.org/')
assert 'Airship Treasuremap' in cmd.stdout

def test_governance_openstack_org(host):
cmd = host.run('curl --insecure '
'--resolve governance.openstack.org:443:127.0.0.1 '


Loading…
Cancel
Save