Switching to parametrized classes

diff --git a/manifests/cron.pp b/manifests/cron.pp
index 1fae59e4e1ad866720c1a582f5c64ee8c18a44fe..afaaa9082ecde4ab1b749ebb9570d6bd6b01913b 100644 (file)
--- a/manifests/cron.pp
+++ b/manifests/cron.pp
@@ -1,4 +1,4 @@
-class reprepro::cron inherits reprepro {
+class reprepro::cron {
   cron { reprepro:
     command => "/usr/bin/reprepro --silent -b $basedir processincoming incoming",
     user => reprepro,

diff --git a/manifests/init.pp b/manifests/init.pp
index 5c24c630ca78b006097badfe337812abf6daa203..0bab6d6f328bc5b5f1ddd67c413999e8259f6f69 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,16 +1,14 @@
-class reprepro {
+class reprepro(
+  $origin    = $::domain,
+  $uploaders = '',
+  $basedir   = '/srv/reprepro'
+) {
 
-  case $reprepro_origin {
-    '': { $reprepro_origin = $domain }
-  }
+  $reprepro_origin    = $origin
+  $reprepro_uploaders = $uploaders
 
   case $reprepro_uploaders {
-    '': { fail("You need the repository uploaders! Please set \$reprepro_uploaders in your config") }
-  }
-
-  $basedir = $reprepro_basedir ? {
-    ''      => '/srv/reprepro',
-    default => $reprepro_basedir,
+    '': { fail("You need the repository uploaders! Please pass \$uploaders parameter") }
   }
 
   case $lsbdistcodename {

diff --git a/manifests/inotify.pp b/manifests/inotify.pp
index 816441bdd579f95d217437dca4709823f03c6cff..750ea571d353ef8a37a2c69f88c08919bcb57e2a 100644 (file)
--- a/manifests/inotify.pp
+++ b/manifests/inotify.pp
@@ -1,4 +1,5 @@
-class reprepro::inotify inherits reprepro {
+class reprepro::inotify {
+
   case $lsbdistcodename {
     etch: { 
       package {

diff --git a/manifests/lighty.pp b/manifests/lighty.pp
index 4e34f5ed6f58dd997f90877b3187dfebc1d6473f..24228cf84d35e9872003c0501fa8186ac9a93a6e 100644 (file)
--- a/manifests/lighty.pp
+++ b/manifests/lighty.pp
@@ -1,5 +1,4 @@
 class reprepro::lighty inherits lighttpd {
-  include reprepro
   file { "/etc/lighttpd/conf-available/20-reprepro.conf":
       ensure => present,
       content => "alias.url += ( \"/debian/\" => \"$reprepro::basedir/\" )\n";