Add epoll::var class for epoll configuration

And move db password extlookup outside module

2 files changed, 34 insertions, 7 deletions

diff --git a/modules/epoll/manifests/init.pp b/modules/epoll/manifests/init.pp
index f00d2a3e..2d61b517 100644
--- a/modules/epoll/manifests/init.pp
+++ b/modules/epoll/manifests/init.pp
@@ -1,22 +1,19 @@
 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')
+    apache::vhost::redirect_ssl { $epoll::var::vhost: }
 
     postgresql::remote_db_and_user { 'epoll':
         description => 'Epoll database',
-        password    => $pgsql_password,
+        password    => $epoll::var::db_password,
     }
 
     file { 'epoll.yml':
diff --git a/modules/epoll/manifests/var.pp b/modules/epoll/manifests/var.pp
new file mode 100644
index 00000000..e1393771
--- /dev/null
+++ b/modules/epoll/manifests/var.pp
@@ -0,0 +1,30 @@
+# == Class: epoll::var
+#
+# epoll configuration
+#
+# === Parameters
+#
+# [*vhost*]
+#   epoll vhost
+#
+# [*db_hostname*]
+#   hostname of the database server
+#
+# [*db_name*]
+#   name of the database
+#
+# [*db_user*]
+#   user to connect to the database
+#
+# [*db_password*]
+#   password to connect to the database
+#
+class epoll::var (
+  $vhost       = "epoll.$::domain"
+  $db_hostname = 'localhost',
+  $db_name     = 'epoll',
+  $db_user     = 'epoll',
+  $db_password
+) {
+}
+# vim: sw=2