From 209e5e03e0e8fc59137c6ddbff4ec1b703a2c0a4 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@redhat.com>
Date: Mon, 4 Feb 2019 12:53:04 -0800
Subject: [PATCH] Add git-test website
This serves static files out of afs, so we can test redirects from
git.openstack.org to opendev.
Change-Id: I5bdec079ca12074bb761862632d936306c713df4
---
manifests/site.pp | 8 +++++++
.../templates/git-test.vhost.erb | 24 +++++++++++++++++++
2 files changed, 32 insertions(+)
create mode 100644 modules/openstack_project/templates/git-test.vhost.erb
diff --git a/manifests/site.pp b/manifests/site.pp
index 4dc99a314f..554a0a26f3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -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 => [],
diff --git a/modules/openstack_project/templates/git-test.vhost.erb b/modules/openstack_project/templates/git-test.vhost.erb
new file mode 100644
index 0000000000..5bc3b659cf
--- /dev/null
+++ b/modules/openstack_project/templates/git-test.vhost.erb
@@ -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>