From a126312584199726a90c3dd7144abba48a8bd1b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Louis-Philippe=20V=C3=A9ronneau?= Date: Tue, 19 Jun 2018 12:49:49 -0400 Subject: remove polipo support --- README.md | 10 --- files/polipo/polipo.conf | 164 --------------------------------------------- manifests/compact.pp | 3 - manifests/polipo.pp | 9 --- manifests/polipo/base.pp | 22 ------ manifests/polipo/debian.pp | 7 -- 6 files changed, 215 deletions(-) delete mode 100644 files/polipo/polipo.conf delete mode 100644 manifests/polipo.pp delete mode 100644 manifests/polipo/base.pp delete mode 100644 manifests/polipo/debian.pp diff --git a/README.md b/README.md index dac7078..b4ea4de 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,6 @@ * [Configuring exit policies](#configuring-exit-policies) * [Configuring transport plugins](#configuring-transport-plugins) * [Functions](#functions) -* [Polipo](#polipo) * [Munin](#munin) # Overview @@ -244,15 +243,6 @@ This function takes a 1024bit RSA private key as an argument and returns the oni This function takes a path (on the puppetmaster!) and an identifier for a key and returns an array containing the matching onion address and the private key. The private key either exists under the supplied `path/key_identifier` or is being generated on the fly and stored under that path for the next execution. -# Polipo - -Polipo support can be enabled by doing: - - include tor::polipo - -This will inherit the `tor` class by default, remove `privoxy` if it's -installed, and install `polipo`, making sure it is running. - # Munin If you are using `munin`, and have the puppet munin module installed, you can diff --git a/files/polipo/polipo.conf b/files/polipo/polipo.conf deleted file mode 100644 index 12b10c4..0000000 --- a/files/polipo/polipo.conf +++ /dev/null @@ -1,164 +0,0 @@ -# Polipo Configuration from https://svn.torproject.org/svn/torbrowser/trunk/build-scripts/config/polipo.conf -# Managed by puppet. - -### Basic configuration -### ******************* - -# Uncomment one of these if you want to allow remote clients to -# connect: - -# proxyAddress = "::0" # both IPv4 and IPv6 -# proxyAddress = "0.0.0.0" # IPv4 only - -proxyAddress = "127.0.0.1" -proxyPort = 8118 - -# If you do that, you'll want to restrict the set of hosts allowed to -# connect: - -# allowedClients = "127.0.0.1, 134.157.168.57" -# allowedClients = "127.0.0.1, 134.157.168.0/24" - -allowedClients = 127.0.0.1 -allowedPorts = 1-65535 - -# Uncomment this if you want your Polipo to identify itself by -# something else than the host name: - -proxyName = "localhost" - -# Uncomment this if there's only one user using this instance of Polipo: - -cacheIsShared = false - -# Uncomment this if you want to use a parent proxy: - -# parentProxy = "squid.example.org:3128" - -# Uncomment this if you want to use a parent SOCKS proxy: - -socksParentProxy = "localhost:9050" -socksProxyType = socks5 - - -### Memory -### ****** - -# Uncomment this if you want Polipo to use a ridiculously small amount -# of memory (a hundred C-64 worth or so): - -# chunkHighMark = 819200 -# objectHighMark = 128 - -# Uncomment this if you've got plenty of memory: - -# chunkHighMark = 50331648 -# objectHighMark = 16384 - -chunkHighMark = 67108864 - -### On-disk data -### ************ - -# Uncomment this if you want to disable the on-disk cache: - -diskCacheRoot = "" - -# Uncomment this if you want to put the on-disk cache in a -# non-standard location: - -# diskCacheRoot = "~/.polipo-cache/" - -# Uncomment this if you want to disable the local web server: - -localDocumentRoot = "" - -# Uncomment this if you want to enable the pages under /polipo/index? -# and /polipo/servers?. This is a serious privacy leak if your proxy -# is shared. - -# disableIndexing = false -# disableServersList = false - -disableLocalInterface = true -disableConfiguration = true - -### Domain Name System -### ****************** - -# Uncomment this if you want to contact IPv4 hosts only (and make DNS -# queries somewhat faster): -# -# dnsQueryIPv6 = no - -# Uncomment this if you want Polipo to prefer IPv4 to IPv6 for -# double-stack hosts: -# -# dnsQueryIPv6 = reluctantly - -# Uncomment this to disable Polipo's DNS resolver and use the system's -# default resolver instead. If you do that, Polipo will freeze during -# every DNS query: - -dnsUseGethostbyname = yes - - -### HTTP -### **** - -# Uncomment this if you want to enable detection of proxy loops. -# This will cause your hostname (or whatever you put into proxyName -# above) to be included in every request: - -disableVia = true - -# Uncomment this if you want to slightly reduce the amount of -# information that you leak about yourself: - -# censoredHeaders = from, accept-language -# censorReferer = maybe - -censoredHeaders = from,accept-language,x-pad,link -censorReferer = maybe - -# Uncomment this if you're paranoid. This will break a lot of sites, -# though: - -# censoredHeaders = set-cookie, cookie, cookie2, from, accept-language -# censorReferer = true - -# Uncomment this if you want to use Poor Man's Multiplexing; increase -# the sizes if you're on a fast line. They should each amount to a few -# seconds' worth of transfer; if pmmSize is small, you'll want -# pmmFirstSize to be larger. - -# Note that PMM is somewhat unreliable. - -# pmmFirstSize = 16384 -# pmmSize = 8192 - -# Uncomment this if your user-agent does something reasonable with -# Warning headers (most don't): - -# relaxTransparency = maybe - -# Uncomment this if you never want to revalidate instances for which -# data is available (this is not a good idea): - -# relaxTransparency = yes - -# Uncomment this if you have no network: - -# proxyOffline = yes - -# Uncomment this if you want to avoid revalidating instances with a -# Vary header (this is not a good idea): - -# mindlesslyCacheVary = true - -# Suggestions from Incognito configuration -maxConnectionAge = 5m -maxConnectionRequests = 120 -serverMaxSlots = 8 -serverSlots = 2 -tunnelAllowedPorts = 1-65535 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 From 21481ba6a39c61b6fb838a524c7b5a6b7605036b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Louis-Philippe=20V=C3=A9ronneau?= Date: Tue, 19 Jun 2018 12:51:12 -0400 Subject: remove 'compact' class --- manifests/compact.pp | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 manifests/compact.pp diff --git a/manifests/compact.pp b/manifests/compact.pp deleted file mode 100644 index 56e74cc..0000000 --- a/manifests/compact.pp +++ /dev/null @@ -1,6 +0,0 @@ -# manage a complete tor -# installation with all the basics -class tor::compact { - include ::tor - include tor::torsocks -} -- cgit v1.2.3