Moving inotify and cron classes to custo files

diff --git a/manifests/cron.pp b/manifests/cron.pp
new file mode 100644 (file)
index 0000000..1fae59e
--- /dev/null
+++ b/manifests/cron.pp
@@ -0,0 +1,8 @@
+class reprepro::cron inherits reprepro {
+  cron { reprepro:
+    command => "/usr/bin/reprepro --silent -b $basedir processincoming incoming",
+    user => reprepro,
+    minute => '*/5',
+    require => [ Package['reprepro'], File["$basedir/conf/distributions"] ]
+  }
+}

diff --git a/manifests/init.pp b/manifests/init.pp
index 28bf048bbbe0140cdc61dc102cca720e595a1dd0..5ce0a447c314489174abd669749d8f5285c05146 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -128,51 +128,3 @@ class reprepro {
 # TODO: setup needeed lines in apache site config file
 
 }
-
-class reprepro::cron inherits reprepro {
-  cron { reprepro:
-    command => "/usr/bin/reprepro --silent -b $basedir processincoming incoming",
-    user => reprepro,
-    minute => '*/5',
-    require => [ Package['reprepro'], File["$basedir/conf/distributions"] ]
-  }
-}
-
-class reprepro::inotify inherits reprepro {
-  case $lsbdistcodename {
-    etch: { 
-      package {
-        "inoticoming": ensure => '0.2.0-1~bpo40+1';
-      }
-    }
-    default: {
-      package {
-        "inoticoming": ensure => 'installed';
-      }
-    }
-  }
-
-  file { "/etc/init.d/reprepro":
-      owner => root, group => root, mode => 0755,
-      source => "puppet://$server/modules/reprepro/inoticoming.init";
-  }
-  file { "/etc/default/reprepro":
-      ensure => present,
-      owner => root, group => root, mode => 0755,
-      content => template('reprepro/inoticoming.default.erb'),
-  }
-
-  exec { "reprepro_init_script":
-      command => "/usr/sbin/update-rc.d reprepro defaults",
-      unless => "/bin/ls /etc/rc3.d/ | /bin/grep reprepro",
-      require => File["/etc/init.d/reprepro"],
-  }
-  service { "reprepro":
-      ensure => "running",
-      pattern => "inoticoming.*reprepro.*processincoming",
-      hasstatus => false,
-      require => [File["/etc/default/reprepro"],
-                  Exec["reprepro_init_script"],
-                  File["/etc/init.d/reprepro"] ],
-  }
-}

diff --git a/manifests/inotify.pp b/manifests/inotify.pp
new file mode 100644 (file)
index 0000000..816441b
--- /dev/null
+++ b/manifests/inotify.pp
@@ -0,0 +1,38 @@
+class reprepro::inotify inherits reprepro {
+  case $lsbdistcodename {
+    etch: { 
+      package {
+        "inoticoming": ensure => '0.2.0-1~bpo40+1';
+      }
+    }
+    default: {
+      package {
+        "inoticoming": ensure => 'installed';
+      }
+    }
+  }
+
+  file { "/etc/init.d/reprepro":
+      owner => root, group => root, mode => 0755,
+      source => "puppet://$server/modules/reprepro/inoticoming.init";
+  }
+  file { "/etc/default/reprepro":
+      ensure => present,
+      owner => root, group => root, mode => 0755,
+      content => template('reprepro/inoticoming.default.erb'),
+  }
+
+  exec { "reprepro_init_script":
+      command => "/usr/sbin/update-rc.d reprepro defaults",
+      unless => "/bin/ls /etc/rc3.d/ | /bin/grep reprepro",
+      require => File["/etc/init.d/reprepro"],
+  }
+  service { "reprepro":
+      ensure => "running",
+      pattern => "inoticoming.*reprepro.*processincoming",
+      hasstatus => false,
+      require => [File["/etc/default/reprepro"],
+                  Exec["reprepro_init_script"],
+                  File["/etc/init.d/reprepro"] ],
+  }
+}