hope this works

stephenrjohnson · Jan 24, 2012 · c616170 · c616170
1 parent 0a3964b
commit c616170
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 12 deletions.
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
@@ -26,20 +26,25 @@
         content => template("apache2/vhost.conf.erb");
     }
 
+    if $ssl != false
+    {
+       require apache2::sslkey[$sslkeys] 
+       $sslcert = apache2::sslkey[$sslkeys]::sslcert
+       $sslkey = apache2::sslkey[$sslkeys]::sslkey
+       $sslca = apache2::sslkey[$sslkeys]::sslca
+    }
+
+
     file { "/etc/apache2/sites-enabled/$name.conf":
-	      ensure => "/etc/apache2/sites-available/$name.conf",
-	      notify => Service[apache2],
+          ensure => "/etc/apache2/sites-available/$name.conf",
+          notify => Service[apache2],
     }
 
     file { $docroot:
         ensure => directory,
-    	  require => Package[apache2],
+          require => Package[apache2],
     }
 
-    if $ssl != false
-    {
-       Apache2::vproxy[$name]->Apache2::sslkey[$sslkeys] 
-    }
 }
 
 
diff --git a/manifests/vproxy.pp b/manifests/vproxy.pp
@@ -18,6 +18,15 @@
         $aport = $port 
     }
 
+    if $ssl != false
+    {
+       require apache2::sslkey[$sslkeys] 
+       $sslcert = apache2::sslkey[$sslkeys]::sslcert
+       $sslkey = apache2::sslkey[$sslkeys]::sslkey
+       $sslca = apache2::sslkey[$sslkeys]::sslca
+
+    }
+
     file { "/etc/apache2/sites-available/$name.conf":
         ensure => present,
         mode => 0440,
@@ -32,11 +41,6 @@
         notify => Service[apache2],
     }
 
-    if $ssl != false
-    {
-       require apache2::sslkey[$sslkeys] 
-    }
-
 }