Merge "Add git-test website"

This commit is contained in:
Zuul 2019-02-04 23:21:38 +00:00 committed by Gerrit Code Review
commit 56888df142
2 changed files with 32 additions and 0 deletions
manifests
modules/openstack_project/templates

View File

@ -504,6 +504,14 @@ node /^files\d*\.open.*\.org$/ {
require => Class['Openstack_project::Server'],
}
# Temporary for evaluating htaccess rules
::httpd::vhost { "git-test.openstack.org":
port => 80, # Is required despite not being used.
docroot => "/afs/openstack.org/project/git-test/www",
priority => '50',
template => 'openstack_project/git-test.vhost.erb',
}
openstack_project::website { 'docs.starlingx.io':
volume_name => 'starlingx.io',
aliases => [],

View File

@ -0,0 +1,24 @@
# ************************************
# Managed by Puppet
# ************************************
<VirtualHost *:80>
ServerName <%= @srvname %>
RewriteEngine on
DocumentRoot <%= @docroot %>
<Directory <%= @docroot %>>
Options Indexes FollowSymLinks MultiViews
Satisfy any
Require all granted
AllowOverride None
# Allow mod_rewrite rules
AllowOverrideList Redirect RedirectMatch
ErrorDocument 404 /errorpage.html
</Directory>
ErrorLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= @name %>_error.log
LogLevel warn
CustomLog /var/log/<%= scope.lookupvar("httpd::params::apache_name") %>/<%= @name %>_access.log combined
ServerSignature Off
</VirtualHost>