opendev/system-config
Code Issues Proposed changes

Remove docs-draft vhost from static.o.o

Browse Source 
All draft documentation jobs now just publish content into an "html"
subtree of their job logs on logs.openstack.org and have been doing
so since longer than our configured content expiration period, so
the separate vhost for docs-draft.openstack.org is no longer
required and can be removed.

While here, change up the CORS configuration for
storyboard.openstack.org and storyboard-dev.openstack.org to respect
draft storyboard-webclient copies on logs.openstack.org rather than
simply removing these stanzas.

Once this change merges and configuration gets applied to
static.openstack.org, the allocated resources for the old docs-draft
vhost (logical volume, DNS entry) can be safely removed.

Change-Id: Ib44df24100192f7903eb60c6fc93feeea0894b90
This commit is contained in:
Jeremy Stanley 2017-12-07 20:57:25 +00:00
parent e93a1f2164
commit 66dea3f74e
3 changed files with 4 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/source/static.rst
View File

@ -13,7 +13,6 @@ At a Glance
:Hosts:
* http://logs.openstack.org
* http://docs-draft.openstack.org
* http://status.openstack.org
* http://mirror.openstack.org
* http://specs.openstack.org

8
manifests/site.pp
View File

@ -755,11 +755,11 @@ node 'storyboard.openstack.org' {
hostname => $::fqdn,
valid_oauth_clients => [
$::fqdn,
'docs-draft.openstack.org',
'logs.openstack.org',
],
cors_allowed_origins => [
"https://${::fqdn}",
'http://docs-draft.openstack.org',
'http://logs.openstack.org',
],
sender_email_address => 'storyboard@storyboard.openstack.org',
}
@ -779,11 +779,11 @@ node 'storyboard-dev.openstack.org' {
hostname => $::fqdn,
valid_oauth_clients => [
$::fqdn,
'docs-draft.openstack.org',
'logs.openstack.org',
],
cors_allowed_origins => [
"https://${::fqdn}",
'http://docs-draft.openstack.org',
'http://logs.openstack.org',
],
sender_email_address => 'storyboard-dev@storyboard-dev.openstack.org',
}

33
modules/openstack_project/manifests/static.pp
View File

@ -261,39 +261,6 @@ class openstack_project::static (
require => [File['/srv/static/logs/help'], Vcsrepo['/opt/tripleo-ci']],
}
###########################################################
# Docs-draft
::httpd::vhost { 'docs-draft.openstack.org':
port => 443, # Is required despite not being used.
docroot => '/srv/static/docs-draft',
priority => '50',
ssl => true,
template => 'openstack_project/static-http-and-https.vhost.erb',
vhost_name => 'docs-draft.openstack.org',
require => [
File['/srv/static/docs-draft'],
File[$cert_file],
File[$key_file],
],
}
file { '/srv/static/docs-draft':
ensure => directory,
owner => 'jenkins',
group => 'jenkins',
require => User['jenkins'],
}
file { '/srv/static/docs-draft/robots.txt':
ensure => present,
owner => 'root',
group => 'root',
mode => '0444',
source => 'puppet:///modules/openstack_project/disallow_robots.txt',
require => File['/srv/static/docs-draft'],
}
###########################################################
# Security