decouple polipo and torsocks into their own subclasses, so we can for example also...

diff --git a/files/polipo.conf b/files/polipo/polipo.conf
similarity index 100%
rename from files/polipo.conf
rename to files/polipo/polipo.conf

diff --git a/files/polipo.cron b/files/polipo/polipo.cron
similarity index 100%
rename from files/polipo.cron
rename to files/polipo/polipo.cron

diff --git a/manifests/init.pp b/manifests/init.pp
index 8b78f65e59e2dc895f0016dfad5bf7a739730e3c..5d1c3d86e4328c7ea63c0bde22c7b40a829a6c83 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,5 +1,5 @@
 class tor {
-  package { [ "tor", "polipo", "torsocks" ]:
+  package {'tor':
     ensure => installed,
   }
 
@@ -8,31 +8,4 @@ class tor {
     enable  => true,
     require => Package['tor'],
   }
-
-  service { "polipo":
-    ensure  => running,
-    enable  => true,
-  }
-
-  file { "/etc/polipo/config":
-    ensure  => present,
-    owner   => root,
-    group   => root,
-    mode    => 0644,
-    source  => "puppet:///modules/tor/polipo.conf",
-    require => Package["polipo"],
-    notify  => Service["polipo"],
-    before  => Service["tor"],
-  }
-
-  # 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.pp b/manifests/polipo.pp
new file mode 100644 (file)
index 0000000..a7ef005
--- /dev/null
+++ b/manifests/polipo.pp
@@ -0,0 +1,8 @@
+class tor::polipo {
+  include ::tor
+
+  case $operatingsystem {
+    'debian': { include tor::polipo::debian }
+    default: { include tor::polipo::base }
+  }
+}

diff --git a/manifests/polipo/base.pp b/manifests/polipo/base.pp
new file mode 100644 (file)
index 0000000..a634920
--- /dev/null
+++ b/manifests/polipo/base.pp
@@ -0,0 +1,21 @@
+class tor::polipo::base {
+  package{'polipo':
+    ensure => present,
+  }
+
+  file { "/etc/polipo/config":
+    ensure  => present,
+    owner   => root,
+    group   => root,
+    mode    => 0644,
+    source  => "puppet:///modules/tor/polipo/polipo.conf",
+    require => Package["polipo"],
+    notify  => Service["polipo"],
+    before  => Service["tor"],
+  }
+
+  service { "polipo":
+    ensure  => running,
+    enable  => true,
+  }
+}

diff --git a/manifests/polipo/debian.pp b/manifests/polipo/debian.pp
new file mode 100644 (file)
index 0000000..1986119
--- /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/polipo.cron",
+  }
+}

diff --git a/manifests/torsocks.pp b/manifests/torsocks.pp
new file mode 100644 (file)
index 0000000..e3221c9
--- /dev/null
+++ b/manifests/torsocks.pp
@@ -0,0 +1,6 @@
+class tor::torsocks {
+  include ::tor
+  package{'torsocks':
+    ensure => present,
+  }
+}