From a126312584199726a90c3dd7144abba48a8bd1b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Louis-Philippe=20V=C3=A9ronneau?= <pollito@riseup.net>
Date: Tue, 19 Jun 2018 12:49:49 -0400
Subject: remove polipo support

---
 manifests/compact.pp       |  3 ---
 manifests/polipo.pp        |  9 ---------
 manifests/polipo/base.pp   | 22 ----------------------
 manifests/polipo/debian.pp |  7 -------
 4 files changed, 41 deletions(-)
 delete mode 100644 manifests/polipo.pp
 delete mode 100644 manifests/polipo/base.pp
 delete mode 100644 manifests/polipo/debian.pp

(limited to 'manifests')

diff --git a/manifests/compact.pp b/manifests/compact.pp
index 901dd8b..56e74cc 100644
--- a/manifests/compact.pp
+++ b/manifests/compact.pp
@@ -3,7 +3,4 @@
 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',
-  }
-}
-- 
cgit v1.2.3