1 files changed, 3 insertions, 11 deletions
diff --git a/modules/epoll/manifests/init.pp b/modules/epoll/manifests/init.pp
index f00d2a3e..fb86f23a 100644
--- a/modules/epoll/manifests/init.pp
+++ b/modules/epoll/manifests/init.pp
@@ -1,23 +1,15 @@
 class epoll {
-
-    $vhost = "epoll.$::domain"
+    include epoll::var
 
     package { 'Epoll': }
 
-    apache::vhost::catalyst_app { $vhost:
+    apache::vhost::catalyst_app { $epoll::var::vhost:
         script  => '/usr/bin/epoll_fastcgi.pl',
         use_ssl => true,
         require => Package['Epoll']
     }
 
-    apache::vhost::redirect_ssl { $vhost: }
-
-    $pgsql_password = extlookup('epoll_pgsql','x')
-
-    postgresql::remote_db_and_user { 'epoll':
-        description => 'Epoll database',
-        password    => $pgsql_password,
-    }
+    apache::vhost::redirect_ssl { $epoll::var::vhost: }
 
     file { 'epoll.yml':
         path    => '/etc/epoll.yml',