aboutsummaryrefslogtreecommitdiff
path: root/manifests/daemon/directory.pp
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-01-20 23:09:20 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-01-20 23:09:20 -0200
commitf252115be193d58d345b7d18228800c68a1e47aa (patch)
tree31c95ada21d54314ecb1650f2b19e8540386dd62 /manifests/daemon/directory.pp
parent89d3242cc7d4607f5eb8f1df39985c3597ee428d (diff)
parenta780e84001177f10a86a7bf824589c0553f513a0 (diff)
downloadpuppet-tor-f252115be193d58d345b7d18228800c68a1e47aa.tar.gz
puppet-tor-f252115be193d58d345b7d18228800c68a1e47aa.tar.bz2
Merge branch 'master' of ssh://labs.riseup.net/shared-tor
Conflicts: manifests/daemon.pp
Diffstat (limited to 'manifests/daemon/directory.pp')
-rw-r--r--manifests/daemon/directory.pp27
1 files changed, 27 insertions, 0 deletions
diff --git a/manifests/daemon/directory.pp b/manifests/daemon/directory.pp
new file mode 100644
index 0000000..b71b6e6
--- /dev/null
+++ b/manifests/daemon/directory.pp
@@ -0,0 +1,27 @@
+# directory advertising
+define tor::daemon::directory (
+ $port = 0,
+ $listen_addresses = [],
+ $port_front_page = '/etc/tor/tor.html',
+ $ensure = present ) {
+
+ concat::fragment { '06.directory':
+ ensure => $ensure,
+ content => template('tor/torrc.directory.erb'),
+ owner => 'debian-tor',
+ group => 'debian-tor',
+ mode => '0644',
+ order => 06,
+ target => $tor::daemon::config_file,
+ }
+
+ file { '/etc/tor/tor.html':
+ ensure => $ensure,
+ source => 'puppet:///modules/tor/tor.html',
+ require => File['/etc/tor'],
+ owner => 'debian-tor',
+ group => 'debian-tor',
+ mode => '0644',
+ }
+}
+