diff options
author | Micah Anderson <micah@riseup.net> | 2018-01-29 12:07:15 -0500 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2018-01-29 12:07:15 -0500 |
commit | b1af45d47d3e1441405a9b4b67f44f7d6008486a (patch) | |
tree | e04489f4d3755c91c637ac413596c172300c3aad /manifests/daemon/base.pp | |
parent | 447ba8b809d0df60f9eabdbc6fc2b52cd17ef50b (diff) | |
parent | 90cb24c6e0916b27eae744e5f6ecaa84a180517c (diff) |
Merge branch 'master' into riseup
Diffstat (limited to 'manifests/daemon/base.pp')
-rw-r--r-- | manifests/daemon/base.pp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/manifests/daemon/base.pp b/manifests/daemon/base.pp index c0b1640..f3bbc37 100644 --- a/manifests/daemon/base.pp +++ b/manifests/daemon/base.pp @@ -2,7 +2,7 @@ class tor::daemon::base inherits tor::base { # packages, user, group Service['tor'] { - subscribe => File[$tor::daemon::config_file], + subscribe => Concat[$tor::daemon::config_file], } Package[ 'tor' ] { @@ -56,11 +56,7 @@ class tor::daemon::base inherits tor::base { # config file headers concat::fragment { '00.header': - ensure => present, content => template('tor/torrc.header.erb'), - owner => 'debian-tor', - group => 'debian-tor', - mode => '0644', order => 00, target => $tor::daemon::config_file, } @@ -68,9 +64,6 @@ class tor::daemon::base inherits tor::base { # global configurations concat::fragment { '01.global': content => template('tor/torrc.global.erb'), - owner => 'debian-tor', - group => 'debian-tor', - mode => '0644', order => 01, target => $tor::daemon::config_file, } |