Merge "Add git-test website"

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          => [],

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>