1 files changed, 14 insertions, 17 deletions
diff --git a/modules/epoll/manifests/init.pp b/modules/epoll/manifests/init.pp
index e981a952..fb86f23a 100644
--- a/modules/epoll/manifests/init.pp
+++ b/modules/epoll/manifests/init.pp
@@ -1,23 +1,20 @@
 class epoll {
+    include epoll::var
 
-    $vhost = "epoll.$domain"
+    package { 'Epoll': }
 
-    package { 'Epoll':
-        ensure => installed
+    apache::vhost::catalyst_app { $epoll::var::vhost:
+        script  => '/usr/bin/epoll_fastcgi.pl',
+        use_ssl => true,
+        require => Package['Epoll']
     }
-    
-    apache::vhost_catalyst_app { $vhost:
-        script => "/usr/bin/epoll_fastcgi.pl" 
-    }
-     
-    $password = extlookup("epoll_password")
- 
-    file { "epoll.yml": 
-        path => "/etc/epoll.yml",    
-        ensure => "present",
-        owner => root,
-        group => apache,
-        mode => 640,
-        content => template("epoll/epoll.yml")
+
+    apache::vhost::redirect_ssl { $epoll::var::vhost: }
+
+    file { 'epoll.yml':
+        path    => '/etc/epoll.yml',
+        group   => 'apache',
+        mode    => '0640',
+        content => template('epoll/epoll.yml')
     }
 }