diff options
| -rw-r--r-- | manifests/daemon/map_address.pp | 2 | ||||
| -rw-r--r-- | manifests/polipo/debian.pp | 5 | ||||
| -rw-r--r-- | templates/torrc.global.erb | 10 |
3 files changed, 11 insertions, 6 deletions
diff --git a/manifests/daemon/map_address.pp b/manifests/daemon/map_address.pp index e970fe5..cfbd3da 100644 --- a/manifests/daemon/map_address.pp +++ b/manifests/daemon/map_address.pp @@ -1,7 +1,7 @@ # map address definition define tor::daemon::map_address( $address = '', - $newaddress = '' + $newaddress = '', $ensure = 'present') { concat::fragment { "08.map_address.${name}": diff --git a/manifests/polipo/debian.pp b/manifests/polipo/debian.pp index e39f603..5ca6922 100644 --- a/manifests/polipo/debian.pp +++ b/manifests/polipo/debian.pp @@ -10,4 +10,9 @@ class tor::polipo::debian inherits tor::polipo::base { require => Package['polipo'], source => 'puppet:///modules/tor/polipo/polipo.cron', } + + Service['polipo'] { + hasstatus => false, + pattern => '/usr/bin/polipo', + } } diff --git a/templates/torrc.global.erb b/templates/torrc.global.erb index 3a3b623..0bc3bf2 100644 --- a/templates/torrc.global.erb +++ b/templates/torrc.global.erb @@ -1,15 +1,15 @@ # runtime RunAsDaemon 1 -DataDirectory <%= data_dir %> +DataDirectory <%= scope.lookupvar('tor::daemon::data_dir') %> # log -<%- if log_rules != [] then -%> -<%- for log_rule in log_rules -%> +<%- if scope.lookupvar('tor::daemon::log_rules') != [] then -%> +<%- for log_rule in scope.lookupvar('tor::daemon::log_rules') -%> Log <%= log_rule %> <%- end -%> <%- else -%> Log notice syslog <%- end -%> -AutomapHostsOnResolve <%= automap_hosts_on_resolve%> -UseBridges <%= use_bridges%> +AutomapHostsOnResolve <%= scope.lookupvar('tor::daemon::automap_hosts_on_resolve') %> +UseBridges <%= scope.lookupvar('tor::daemon::use_bridges') %> |