diff options
| author | mh <mh@immerda.ch> | 2014-04-18 11:10:47 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2014-04-18 11:10:47 +0200 |
| commit | a9b391b774eae6d1272368f00e96cab022648326 (patch) | |
| tree | a005b95ab958f221e32ebb9e1b319affd44968d7 | |
| parent | 8a248e676cf03ceffefe36dddb604754c2236085 (diff) | |
| parent | a31579095231c68a2786955b9149d3bcd13400af (diff) | |
| download | puppet-tor-a9b391b774eae6d1272368f00e96cab022648326.tar.gz puppet-tor-a9b391b774eae6d1272368f00e96cab022648326.tar.bz2 | |
Merge remote-tracking branch 'shared/master'
| -rw-r--r-- | manifests/daemon/directory.pp | 6 |
1 files changed, 3 insertions, 3 deletions
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', |