diff options
author | varac <varacanero@zeromail.org> | 2016-05-17 11:50:50 +0200 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2016-05-17 11:50:50 +0200 |
commit | 9981a70f7ba1f9e4fe33e4eb46654295287c1fc1 (patch) | |
tree | 1beb63d346b919727a0e7e8df124feb5039930cb /manifests | |
parent | 43506968b1760b8a54f012c72baa9a5820cee21a (diff) | |
parent | fd7aad3cb5fb7f8db73ef5dbe2cbab9ab4868325 (diff) |
Merge branch 'master' of gitlab.com:shared-puppet-modules-group/tor
Diffstat (limited to 'manifests')
-rw-r--r-- | manifests/arm.pp | 9 | ||||
-rw-r--r-- | manifests/daemon.pp | 3 | ||||
-rw-r--r-- | manifests/daemon/directory.pp | 6 | ||||
-rw-r--r-- | manifests/daemon/relay.pp | 3 | ||||
-rw-r--r-- | manifests/polipo/debian.pp | 12 | ||||
-rw-r--r-- | manifests/repo.pp | 16 | ||||
-rw-r--r-- | manifests/repo/debian.pp | 9 |
7 files changed, 44 insertions, 14 deletions
diff --git a/manifests/arm.pp b/manifests/arm.pp new file mode 100644 index 0000000..44ddcbb --- /dev/null +++ b/manifests/arm.pp @@ -0,0 +1,9 @@ +# manage tor-arm +class tor::arm ( + $ensure_version = 'installed' +){ + include ::tor + package{'tor-arm': + ensure => $ensure_version, + } +} diff --git a/manifests/daemon.pp b/manifests/daemon.pp index 2440180..2522b2c 100644 --- a/manifests/daemon.pp +++ b/manifests/daemon.pp @@ -6,7 +6,8 @@ class tor::daemon ( $config_file = '/etc/tor/torrc', $use_bridges = 0, $automap_hosts_on_resolve = 0, - $log_rules = [ 'notice file /var/log/tor/notices.log' ] + $log_rules = [ 'notice file /var/log/tor/notices.log' ], + $safe_logging = 1, ) { class{'tor': diff --git a/manifests/daemon/directory.pp b/manifests/daemon/directory.pp index b71b6e6..d877a86 100644 --- a/manifests/daemon/directory.pp +++ b/manifests/daemon/directory.pp @@ -2,7 +2,7 @@ define tor::daemon::directory ( $port = 0, $listen_addresses = [], - $port_front_page = '/etc/tor/tor.html', + $port_front_page = '/etc/tor/tor-exit-notice.html', $ensure = present ) { concat::fragment { '06.directory': @@ -15,9 +15,9 @@ define tor::daemon::directory ( target => $tor::daemon::config_file, } - file { '/etc/tor/tor.html': + file { '/etc/tor/tor-exit-notice.html': ensure => $ensure, - source => 'puppet:///modules/tor/tor.html', + source => 'puppet:///modules/tor/tor-exit-notice.html', require => File['/etc/tor'], owner => 'debian-tor', group => 'debian-tor', diff --git a/manifests/daemon/relay.pp b/manifests/daemon/relay.pp index d5296de..ff52893 100644 --- a/manifests/daemon/relay.pp +++ b/manifests/daemon/relay.pp @@ -3,6 +3,7 @@ define tor::daemon::relay( $port = 0, $listen_addresses = [], $outbound_bindaddresses = [], + $portforwarding = 0, # KB/s, defaulting to using tor's default: 5120KB/s $bandwidth_rate = '', # KB/s, defaulting to using tor's default: 10240KB/s @@ -24,7 +25,7 @@ define tor::daemon::relay( $nickname = $name if $outbound_bindaddresses == [] { - $real_outbound_bindaddresses = $listen_addresses + $real_outbound_bindaddresses = [] } else { $real_outbound_bindaddresses = $outbound_bindaddresses } diff --git a/manifests/polipo/debian.pp b/manifests/polipo/debian.pp index e39f603..607b361 100644 --- a/manifests/polipo/debian.pp +++ b/manifests/polipo/debian.pp @@ -1,13 +1,7 @@ # manage polipo on debian 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', + Service['polipo'] { + hasstatus => false, + pattern => '/usr/bin/polipo', } } diff --git a/manifests/repo.pp b/manifests/repo.pp new file mode 100644 index 0000000..f625599 --- /dev/null +++ b/manifests/repo.pp @@ -0,0 +1,16 @@ +class tor::repo ( + $ensure = present, + $source_name = 'torproject.org', + $include_src = false, +) { + case $::osfamily { + 'Debian': { + $key = '886DDD89' + $location = 'https://deb.torproject.org/torproject.org/' + class { 'tor::repo::debian': } + } + default: { + fail("Unsupported managed repository for osfamily: ${::osfamily}, operatingsystem: ${::operatingsystem}, module ${module_name} currently only supports managing repos for osfamily Debian and Ubuntu") + } + } +} diff --git a/manifests/repo/debian.pp b/manifests/repo/debian.pp new file mode 100644 index 0000000..174c331 --- /dev/null +++ b/manifests/repo/debian.pp @@ -0,0 +1,9 @@ +# PRIVATE CLASS: do not use directly +class tor::repo::debian inherits tor::repo { + apt::source { $source_name: + ensure => $::tor::repo::ensure, + location => $::tor::repo::location, + key => $::tor::repo::key, + include_src => $::tor::repo::include_src, + } +} |