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 ------ 1 file changed, 6 deletions(-) (limited to 'manifests/daemon/base.pp') 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, } -- 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(-) (limited to 'manifests/daemon/base.pp') 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 From c3dd0d46949fd9bf7eff73ff3cc58c71a05936c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Louis-Philippe=20V=C3=A9ronneau?= Date: Thu, 5 Oct 2017 17:25:24 -0400 Subject: concat::fragment does not have an 'ensure' var anymore --- manifests/daemon/base.pp | 1 - 1 file changed, 1 deletion(-) (limited to 'manifests/daemon/base.pp') diff --git a/manifests/daemon/base.pp b/manifests/daemon/base.pp index c0c82ac..f3bbc37 100644 --- a/manifests/daemon/base.pp +++ b/manifests/daemon/base.pp @@ -56,7 +56,6 @@ class tor::daemon::base inherits tor::base { # config file headers concat::fragment { '00.header': - ensure => present, content => template('tor/torrc.header.erb'), order => 00, target => $tor::daemon::config_file, -- cgit v1.2.3