From 5d4ae391657c5349d863d32c6417fcbec1d5fa7a Mon Sep 17 00:00:00 2001
From: Marton Kiss <marton.kiss@gmail.com>
Date: Wed, 5 Aug 2015 19:43:48 +0200
Subject: [PATCH] Resolve SSL certificate dependency issue

Refactor resource dependencies of askbot SSL configuration.

Change-Id: Ia4d656f2ef37b81975a2e2bdf0b8267a08ce7fef
---
 manifests/config.pp   | 1 +
 manifests/site/ssl.pp | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/manifests/config.pp b/manifests/config.pp
index c42bd19..b09b395 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -51,6 +51,7 @@ class askbot::config (
 
   if $site_ssl_enabled {
     class { '::askbot::site::ssl':
+      site_name                    => $site_name,
       site_ssl_cert_file_contents  => $site_ssl_cert_file_contents,
       site_ssl_key_file_contents   => $site_ssl_key_file_contents,
       site_ssl_chain_file_contents => $site_ssl_chain_file_contents,
diff --git a/manifests/site/ssl.pp b/manifests/site/ssl.pp
index 320ae0c..27251a5 100644
--- a/manifests/site/ssl.pp
+++ b/manifests/site/ssl.pp
@@ -1,6 +1,7 @@
 # == Class: askbot::site::ssl
 # This class describes the http server's SSL configuration
 class askbot::site::ssl (
+  $site_name,
   $site_ssl_cert_file_contents  = undef,
   $site_ssl_key_file_contents   = undef,
   $site_ssl_chain_file_contents = undef,
@@ -17,7 +18,7 @@ class askbot::site::ssl (
       group   => 'root',
       mode    => '0640',
       content => $site_ssl_cert_file_contents,
-      before  => Httpd::Vhost[$name],
+      before  => Httpd::Vhost[$site_name],
     }
   }
 
@@ -28,7 +29,7 @@ class askbot::site::ssl (
       group   => 'root',
       mode    => '0640',
       content => $site_ssl_key_file_contents,
-      before  => Httpd::Vhost[$name],
+      before  => Httpd::Vhost[$site_name],
     }
   }
 
@@ -39,7 +40,7 @@ class askbot::site::ssl (
       group   => 'root',
       mode    => '0640',
       content => $site_ssl_chain_file_contents,
-      before  => Httpd::Vhost[$name],
+      before  => Httpd::Vhost[$site_name],
     }
   }
 }