4 files changed, 58 insertions, 19 deletions
diff --git a/modules/epoll/manifests/create_db.pp b/modules/epoll/manifests/create_db.pp
new file mode 100644
index 00000000..8ef9c0aa
--- /dev/null
+++ b/modules/epoll/manifests/create_db.pp
@@ -0,0 +1,7 @@
+class epoll::create_db () {
+  postgresql::remote_db_and_user { $epoll::var::db_name:
+    description => 'Epoll database',
+    password    => $epoll::var::db_password,
+  }
+}
+# vim: sw=2
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')
     }
 }
diff --git a/modules/epoll/manifests/var.pp b/modules/epoll/manifests/var.pp
new file mode 100644
index 00000000..1ddc342a
--- /dev/null
+++ b/modules/epoll/manifests/var.pp
@@ -0,0 +1,35 @@
+# == 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
+#
+# [*password*]
+#   password to create new polls
+#
+
+class epoll::var (
+  $vhost       = "epoll.${::domain}",
+  $db_hostname = 'localhost',
+  $db_name     = 'epoll',
+  $db_user     = 'epoll',
+  $db_password,
+  $password
+) {
+}
+# vim: sw=2
diff --git a/modules/epoll/templates/epoll.yml b/modules/epoll/templates/epoll.yml
index 74e44efd..d442a41e 100644
--- a/modules/epoll/templates/epoll.yml
+++ b/modules/epoll/templates/epoll.yml
@@ -2,10 +2,10 @@
 name: Vote
 # db: connection, see libpq documentation
 # dbname=BASENAME;host=SERVER;user=USER;password=PASS
-db: dbname=epoll;host=localhost;user=epoll;password=<%= password %>
+db: dbname=<%= scope.lookupvar('epoll::var::db_name') %>;host=<%= scope.lookupvar('epoll::var::db_hostname') %>;user=<%= scope.lookupvar('epoll::var::db_user') %>;password=<%= scope.lookupvar('epoll::var::db_password') %>
 # The smtp serveur to use, default is localhost
 # smtp:
 # This change the poll creation behavior, instead ask want confirmation by
 # mail
 # it ask for this password (in clear)
-# newpollpasswd:
+newpollpasswd: <%= scope.lookupvar('epoll::var::password') %>