diff options
-rw-r--r-- | manifests/polipo.pp | 36 | ||||
-rw-r--r-- | manifests/polipo/base.pp | 21 | ||||
-rw-r--r-- | manifests/polipo/debian.pp | 12 |
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", + } +} |