From 148361ca71e944d5d15a8b54e366f2dc821b8361 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Thu, 22 Sep 2016 09:08:45 +0000 Subject: Drop owner, group and mode for concat::fragment. These parameters are not supported anymore in recent versions of the concat module. Besides, they make little sense since what matters is the ownership and permissions of the resulting, merged file. --- manifests/daemon/base.pp | 6 ------ manifests/daemon/bridge.pp | 3 --- manifests/daemon/control.pp | 3 --- manifests/daemon/directory.pp | 3 --- manifests/daemon/dns.pp | 3 --- manifests/daemon/exit_policy.pp | 3 --- manifests/daemon/hidden_service.pp | 3 --- manifests/daemon/map_address.pp | 3 --- manifests/daemon/relay.pp | 3 --- manifests/daemon/snippet.pp | 3 --- manifests/daemon/socks.pp | 3 --- manifests/daemon/transparent.pp | 3 --- 12 files changed, 39 deletions(-) diff --git a/manifests/daemon/base.pp b/manifests/daemon/base.pp index c0b1640..b6b3aa8 100644 --- a/manifests/daemon/base.pp +++ b/manifests/daemon/base.pp @@ -58,9 +58,6 @@ class tor::daemon::base inherits tor::base { 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 +65,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, } diff --git a/manifests/daemon/bridge.pp b/manifests/daemon/bridge.pp index 063f565..83d74e0 100644 --- a/manifests/daemon/bridge.pp +++ b/manifests/daemon/bridge.pp @@ -8,9 +8,6 @@ define tor::daemon::bridge( concat::fragment { "10.bridge.${name}": ensure => $ensure, content => template('tor/torrc.bridge.erb'), - owner => 'debian-tor', - group => 'debian-tor', - mode => '0644', order => 10, target => $tor::daemon::config_file, } diff --git a/manifests/daemon/control.pp b/manifests/daemon/control.pp index d19a1db..ee425f3 100644 --- a/manifests/daemon/control.pp +++ b/manifests/daemon/control.pp @@ -21,9 +21,6 @@ define tor::daemon::control( concat::fragment { '04.control': ensure => $ensure, content => template('tor/torrc.control.erb'), - owner => 'debian-tor', - group => 'debian-tor', - mode => '0600', order => 04, target => $tor::daemon::config_file, } diff --git a/manifests/daemon/directory.pp b/manifests/daemon/directory.pp index d877a86..e2e405d 100644 --- a/manifests/daemon/directory.pp +++ b/manifests/daemon/directory.pp @@ -8,9 +8,6 @@ define tor::daemon::directory ( 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, } diff --git a/manifests/daemon/dns.pp b/manifests/daemon/dns.pp index 4677f24..e8d4fc8 100644 --- a/manifests/daemon/dns.pp +++ b/manifests/daemon/dns.pp @@ -7,9 +7,6 @@ define tor::daemon::dns( concat::fragment { "08.dns.${name}": ensure => $ensure, content => template('tor/torrc.dns.erb'), - owner => 'debian-tor', - group => 'debian-tor', - mode => '0644', order => '08', target => $tor::daemon::config_file, } diff --git a/manifests/daemon/exit_policy.pp b/manifests/daemon/exit_policy.pp index f459ece..df0fb99 100644 --- a/manifests/daemon/exit_policy.pp +++ b/manifests/daemon/exit_policy.pp @@ -8,9 +8,6 @@ define tor::daemon::exit_policy( concat::fragment { "07.exit_policy.${name}": ensure => $ensure, content => template('tor/torrc.exit_policy.erb'), - owner => 'debian-tor', - group => 'debian-tor', - mode => '0644', order => 07, target => $tor::daemon::config_file, } diff --git a/manifests/daemon/hidden_service.pp b/manifests/daemon/hidden_service.pp index c827211..b54aa44 100644 --- a/manifests/daemon/hidden_service.pp +++ b/manifests/daemon/hidden_service.pp @@ -7,9 +7,6 @@ define tor::daemon::hidden_service( concat::fragment { "05.hidden_service.${name}": ensure => $ensure, content => template('tor/torrc.hidden_service.erb'), - owner => 'debian-tor', - group => 'debian-tor', - mode => '0644', order => 05, target => $tor::daemon::config_file, } diff --git a/manifests/daemon/map_address.pp b/manifests/daemon/map_address.pp index 270eac2..ac624a0 100644 --- a/manifests/daemon/map_address.pp +++ b/manifests/daemon/map_address.pp @@ -7,9 +7,6 @@ define tor::daemon::map_address( concat::fragment { "08.map_address.${name}": ensure => $ensure, content => template('tor/torrc.map_address.erb'), - owner => 'debian-tor', - group => 'debian-tor', - mode => '0644', order => '08', target => $tor::daemon::config_file, } diff --git a/manifests/daemon/relay.pp b/manifests/daemon/relay.pp index ff52893..555587c 100644 --- a/manifests/daemon/relay.pp +++ b/manifests/daemon/relay.pp @@ -33,9 +33,6 @@ define tor::daemon::relay( concat::fragment { '03.relay': ensure => $ensure, content => template('tor/torrc.relay.erb'), - owner => 'debian-tor', - group => 'debian-tor', - mode => '0644', order => 03, target => $tor::daemon::config_file, } diff --git a/manifests/daemon/snippet.pp b/manifests/daemon/snippet.pp index b9089b4..7e1494c 100644 --- a/manifests/daemon/snippet.pp +++ b/manifests/daemon/snippet.pp @@ -6,9 +6,6 @@ define tor::daemon::snippet( concat::fragment { "99.snippet.${name}": ensure => $ensure, content => $content, - owner => 'debian-tor', - group => 'debian-tor', - mode => '0644', order => 99, target => $tor::daemon::config_file, } diff --git a/manifests/daemon/socks.pp b/manifests/daemon/socks.pp index 910461c..54c8b6a 100644 --- a/manifests/daemon/socks.pp +++ b/manifests/daemon/socks.pp @@ -6,9 +6,6 @@ define tor::daemon::socks( concat::fragment { '02.socks': content => template('tor/torrc.socks.erb'), - owner => 'debian-tor', - group => 'debian-tor', - mode => '0644', order => 02, target => $tor::daemon::config_file, } diff --git a/manifests/daemon/transparent.pp b/manifests/daemon/transparent.pp index 65d744f..6ac7b44 100644 --- a/manifests/daemon/transparent.pp +++ b/manifests/daemon/transparent.pp @@ -7,9 +7,6 @@ define tor::daemon::transparent( concat::fragment { "09.transparent.${name}": ensure => $ensure, content => template('tor/torrc.transparent.erb'), - owner => 'debian-tor', - group => 'debian-tor', - mode => '0644', order => '09', target => $tor::daemon::config_file, } -- cgit v1.2.3 From 3205c24cfcbac7a20bd8b43166f88c00ebe3cdee Mon Sep 17 00:00:00 2001 From: intrigeri Date: Thu, 22 Sep 2016 09:34:06 +0000 Subject: Subscribe to the Concat resource, not to the File one. This is needed with recent versions of the concat module. --- manifests/daemon/base.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/daemon/base.pp b/manifests/daemon/base.pp index b6b3aa8..c0c82ac 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' ] { -- cgit v1.2.3