aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2012-06-08 17:34:13 +0200
committerintrigeri <intrigeri@boum.org>2012-06-08 17:34:13 +0200
commitc59fe7465bedc1157ee9e314938fdc10c4158cf5 (patch)
tree1627a3be9f810c614c430d1003d68a74ed7a524d
parentfae18b4cb919297eedfb7103e5d06ab76f93abff (diff)
downloadpuppet-tor-c59fe7465bedc1157ee9e314938fdc10c4158cf5.tar.gz
puppet-tor-c59fe7465bedc1157ee9e314938fdc10c4158cf5.tar.bz2
Factor out Polipo into base and Debian -specific classes.
-rw-r--r--manifests/polipo.pp36
-rw-r--r--manifests/polipo/base.pp21
-rw-r--r--manifests/polipo/debian.pp12
3 files changed, 38 insertions, 31 deletions
diff --git a/manifests/polipo.pp b/manifests/polipo.pp
index 72a9236..a7ef005 100644
--- a/manifests/polipo.pp
+++ b/manifests/polipo.pp
@@ -1,34 +1,8 @@
-class tor::polipo inherits tor {
+class tor::polipo {
+ include ::tor
- package { "polipo":
- ensure => installed,
+ case $operatingsystem {
+ 'debian': { include tor::polipo::debian }
+ default: { include tor::polipo::base }
}
-
- service { "polipo":
- ensure => running,
- enable => true,
- require => [ Package["polipo"], Service["tor"] ],
- }
-
- file { "/etc/polipo/config":
- ensure => present,
- owner => root,
- group => root,
- mode => 0644,
- source => "puppet:///modules/tor/polipo.conf",
- require => Package["polipo"],
- notify => Service["polipo"],
- }
-
- # TODO: restore file to original state after the following bug is solved:
- # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=580434
- file { "/etc/cron.daily/polipo":
- ensure => present,
- owner => root,
- group => root,
- mode => 0755,
- require => Package["polipo"],
- source => "puppet:///modules/tor/polipo.cron",
- }
-
}
diff --git a/manifests/polipo/base.pp b/manifests/polipo/base.pp
new file mode 100644
index 0000000..81cfe9c
--- /dev/null
+++ b/manifests/polipo/base.pp
@@ -0,0 +1,21 @@
+class tor::polipo::base {
+ package { "polipo":
+ ensure => installed,
+ }
+
+ file { "/etc/polipo/config":
+ ensure => present,
+ owner => root,
+ group => root,
+ mode => 0644,
+ source => "puppet:///modules/tor/polipo.conf",
+ require => Package["polipo"],
+ notify => Service["polipo"],
+ }
+
+ service { "polipo":
+ ensure => running,
+ enable => true,
+ require => [ Package["polipo"], Service["tor"] ],
+ }
+}
diff --git a/manifests/polipo/debian.pp b/manifests/polipo/debian.pp
new file mode 100644
index 0000000..46897dd
--- /dev/null
+++ b/manifests/polipo/debian.pp
@@ -0,0 +1,12 @@
+class tor::polipo::debian inherits tor::polipo::base {
+ # TODO: restore file to original state after the following bug is solved:
+ # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=580434
+ file { "/etc/cron.daily/polipo":
+ ensure => present,
+ owner => root,
+ group => root,
+ mode => 0755,
+ require => Package["polipo"],
+ source => "puppet:///modules/tor/polipo.cron",
+ }
+}