From 9c98a1edcbd17481feb45b09d5b1efc3d74a39d3 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Thu, 22 Oct 2015 17:37:57 +0000 Subject: [PATCH] Add HTTPS for docs-draft.openstack.org Change-Id: If9df38e2e96299af3d193f615acf7dd5e06c195f --- 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 8666e37185..0f6081e7bf 100644 --- a/modules/openstack_project/manifests/static.pp +++ b/modules/openstack_project/manifests/static.pp @@ -190,10 +190,17 @@ class openstack_project::static ( # Docs-draft ::httpd::vhost { 'docs-draft.openstack.org': - port => 80, - priority => '50', - docroot => '/srv/static/docs-draft', - require => File['/srv/static/docs-draft'], + port => 443, # Is required despite not being used. + docroot => '/srv/static/docs-draft', + priority => '50', + ssl => true, + template => 'openstack_project/static-http-and-https.vhost.erb', + vhost_name => 'docs-draft.openstack.org', + require => [ + File['/srv/static/docs-draft'], + File[$cert_file], + File[$key_file], + ], } file { '/srv/static/docs-draft':