From a167ed03c1329421ef53e1bbcc5e8bd632040640 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Fri, 1 Jul 2016 23:17:38 +0000
Subject: [PATCH] Revert "Add election alias to governance.openstack.org"

This reverts commit 91dcb510bace2f3a14745c18e945f8504a325c15.

The implementation ignored that the referenced template is being
used by many vhosts but the lists for aliases and directories were
defined at (and referenced from) the containing class scope. This
coupled with the newly introduced conditional for the directories
array caused all other vhosts using this template to no longer get
Directory blocks for their docroots.

Change-Id: I808e654a6fb77440e7aecbde4456ddc720fe0d9a
---
 modules/openstack_project/manifests/static.pp | 37 ++++---------------
 .../templates/static-http-and-https.vhost.erb | 18 ---------
 2 files changed, 8 insertions(+), 47 deletions(-)

diff --git a/modules/openstack_project/manifests/static.pp b/modules/openstack_project/manifests/static.pp
index bd06622150..fd6fd30045 100644
--- a/modules/openstack_project/manifests/static.pp
+++ b/modules/openstack_project/manifests/static.pp
@@ -49,10 +49,6 @@ class openstack_project::static (
     }
   }
 
-  if ! defined(Httpd::Mod['alias']) {
-    httpd::mod { 'alias': ensure => present }
-  }
-
   if ! defined(File['/srv/static']) {
     file { '/srv/static':
       ensure => directory,
@@ -256,39 +252,22 @@ class openstack_project::static (
   }
 
   ###########################################################
-  # Governance & Election
-
-  # Extra aliases and directories needed for vhost template:
-  $aliases = {
-    '/election/' => '/srv/static/election/'
-  }
-  $directories = [
-    '/srv/static/election',
-    '/srv/static/governance'
-  ]
+  # Governance
 
   ::httpd::vhost { 'governance.openstack.org':
-    port        => 443, # Is required despite not being used.
-    docroot     => '/srv/static/governance',
-    priority    => '50',
-    ssl         => true,
-    template    => 'openstack_project/static-http-and-https.vhost.erb',
-    vhost_name  => 'governance.openstack.org',
-    require     => [
-      File['/srv/static/election'],
+    port       => 443, # Is required despite not being used.
+    docroot    => '/srv/static/governance',
+    priority   => '50',
+    ssl        => true,
+    template   => 'openstack_project/static-http-and-https.vhost.erb',
+    vhost_name => 'governance.openstack.org',
+    require    => [
       File['/srv/static/governance'],
       File[$cert_file],
       File[$key_file],
     ],
   }
 
-  file { '/srv/static/election':
-    ensure  => directory,
-    owner   => 'jenkins',
-    group   => 'jenkins',
-    require => User['jenkins'],
-  }
-
   file { '/srv/static/governance':
     ensure  => directory,
     owner   => 'jenkins',
diff --git a/modules/openstack_project/templates/static-http-and-https.vhost.erb b/modules/openstack_project/templates/static-http-and-https.vhost.erb
index 0617f32546..189ee44afc 100644
--- a/modules/openstack_project/templates/static-http-and-https.vhost.erb
+++ b/modules/openstack_project/templates/static-http-and-https.vhost.erb
@@ -14,30 +14,12 @@
   RewriteRule ^/(.*)$ http://<%= @vhost_name %>/$1 [L,R=301]
 <% end -%>
   DocumentRoot <%= @docroot %>
-
-<% if scope.lookupvar('openstack_project::static::aliases').is_a? Hash -%>
-  # Alias other folders
-  <% scope.lookupvar('openstack_project::static::aliases').each do |a, d| -%>
-    Alias "<%= a %>" "<%= d %>"
-  <% end -%>
-<% end -%>
-<% if scope.lookupvar('openstack_project::static::directories').is_a? Array -%>
-  <% scope.lookupvar('openstack_project::static::directories').each do |dirname| -%>
-  <Directory <%= dirname %>>
-    Options Indexes FollowSymLinks MultiViews
-    AllowOverride None
-    Satisfy Any
-    Require all granted
-  </Directory>
-  <% end -%>
-<% else -%>
   <Directory <%= @docroot %>>
     Options Indexes FollowSymLinks MultiViews
     AllowOverride None
     Satisfy Any
     Require all granted
   </Directory>
-<% end -%>
   LogLevel warn
   ErrorLog /var/log/apache2/<%= @vhost_name %>_error.log
   CustomLog /var/log/apache2/<%= @vhost_name %>_access.log combined