summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-06-30 22:11:19 -0300
committerSilvio Rhatto <rhatto@riseup.net>2011-06-30 22:11:19 -0300
commitc61b6ea99eda76fb557eb9760b9ee315732d9bb5 (patch)
tree43399e992a2820e563960903590ec2f9723d6b86
parent0048cdea096f3339925bff412bf72507529e73f7 (diff)
downloadpuppet-reprepro-c61b6ea99eda76fb557eb9760b9ee315732d9bb5.tar.gz
puppet-reprepro-c61b6ea99eda76fb557eb9760b9ee315732d9bb5.tar.bz2
Moving inotify and cron classes to custo files
-rw-r--r--manifests/cron.pp8
-rw-r--r--manifests/init.pp48
-rw-r--r--manifests/inotify.pp38
3 files changed, 46 insertions, 48 deletions
diff --git a/manifests/cron.pp b/manifests/cron.pp
new file mode 100644
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 28bf048..5ce0a44 100644
--- 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
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"] ],
+ }
+}