From 0adb22b3716d1b8959c0a7ad8ba5282ab2e61238 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Thu, 22 Oct 2015 17:34:54 +0000
Subject: [PATCH] Add HTTPS for governance.openstack.org

Change-Id: I294d7f18472ad5b172797fe4309e2a5ba1173866
---
 modules/openstack_project/manifests/static.pp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/modules/openstack_project/manifests/static.pp b/modules/openstack_project/manifests/static.pp
index 21b31317e7..9693116f62 100644
--- a/modules/openstack_project/manifests/static.pp
+++ b/modules/openstack_project/manifests/static.pp
@@ -240,10 +240,17 @@ class openstack_project::static (
   # Governance
 
   ::httpd::vhost { 'governance.openstack.org':
-    port     => 80,
-    priority => '50',
-    docroot  => '/srv/static/governance',
-    require  => File['/srv/static/governance'],
+    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/governance':