diff options
| author | micah <micah@riseup.net> | 2014-03-12 10:26:06 -0400 |
|---|---|---|
| committer | micah <micah@riseup.net> | 2014-03-12 10:26:06 -0400 |
| commit | a31579095231c68a2786955b9149d3bcd13400af (patch) | |
| tree | 08af1f91b003daf8a62444ed8fb386fbd32f8ad7 | |
| parent | dcb6e748864e7dfd3c14f4f2aba4c9120f12b78a (diff) | |
| parent | 44f62cacdfe5f27dc34c46a1f4b2918a651d12c9 (diff) | |
| download | puppet-tor-a31579095231c68a2786955b9149d3bcd13400af.tar.gz puppet-tor-a31579095231c68a2786955b9149d3bcd13400af.tar.bz2 | |
Merge pull request #1 from irregulator/bug/5241
DirPortFrontPage should serve the 'tor-exit-notice' static page
| -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', |