Merge branch 'remove-cruft' into 'master'

Remove cruft

See merge request shared-puppet-modules-group/tor!20

4 files changed, 0 insertions, 47 deletions

diff --git a/manifests/compact.pp b/manifests/compact.pp
deleted file mode 100644
index 901dd8b..0000000
--- a/manifests/compact.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# manage a complete tor
-# installation with all the basics
-class tor::compact {
-  include ::tor
-  include tor::torsocks
-  if $facts['osfamily'] == 'Debian' {
-    include tor::polipo
-  }
-}
diff --git a/manifests/polipo.pp b/manifests/polipo.pp
deleted file mode 100644
index 73dc226..0000000
--- a/manifests/polipo.pp
+++ /dev/null
@@ -1,9 +0,0 @@
-# manage the polipo proxy service
-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
deleted file mode 100644
index df2d6ea..0000000
--- a/manifests/polipo/base.pp
+++ /dev/null
@@ -1,22 +0,0 @@
-# manage polipo resources
-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'],
-  }
-
-  service { 'polipo':
-    ensure  => running,
-    enable  => true,
-    require => [ Package['polipo'], Service['tor'] ],
-  }
-}
diff --git a/manifests/polipo/debian.pp b/manifests/polipo/debian.pp
deleted file mode 100644
index 607b361..0000000
--- a/manifests/polipo/debian.pp
+++ /dev/null
@@ -1,7 +0,0 @@
-# manage polipo on debian
-class tor::polipo::debian inherits tor::polipo::base {
-  Service['polipo'] {
-    hasstatus => false,
-    pattern   => '/usr/bin/polipo',
-  }
-}