From 5126584fe40f08b779a6f93e2d1b6b57bae29700 Mon Sep 17 00:00:00 2001 From: Tulio Casagrande Date: Mon, 16 Jan 2017 15:15:41 -0200 Subject: Add apache auto-restart extension file --- puppet/modules/site_apache/manifests/common/extensions.pp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 puppet/modules/site_apache/manifests/common/extensions.pp (limited to 'puppet/modules/site_apache/manifests/common') diff --git a/puppet/modules/site_apache/manifests/common/extensions.pp b/puppet/modules/site_apache/manifests/common/extensions.pp new file mode 100644 index 00000000..ddeafae0 --- /dev/null +++ b/puppet/modules/site_apache/manifests/common/extensions.pp @@ -0,0 +1,14 @@ +class site_apache::common::extensions { + + include ::systemd + file { '/etc/systemd/system/apache2.service.d/auto_restart.conf': + source => 'puppet:///modules/site_apache/auto_restart.conf', + owner => 'root', + group => 'root', + mode => '0644', + require => [ + Service['apache'] + ] + }~> + Exec['systemctl-daemon-reload'] +} -- cgit v1.2.3 From 85d2ae3fca3bc6fca00e9b5bff045e2130fd539c Mon Sep 17 00:00:00 2001 From: Tulio Casagrande Date: Mon, 16 Jan 2017 17:24:50 -0200 Subject: Update how exec is run --- puppet/modules/site_apache/manifests/common/extensions.pp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'puppet/modules/site_apache/manifests/common') diff --git a/puppet/modules/site_apache/manifests/common/extensions.pp b/puppet/modules/site_apache/manifests/common/extensions.pp index ddeafae0..6e489ce8 100644 --- a/puppet/modules/site_apache/manifests/common/extensions.pp +++ b/puppet/modules/site_apache/manifests/common/extensions.pp @@ -6,9 +6,7 @@ class site_apache::common::extensions { owner => 'root', group => 'root', mode => '0644', - require => [ - Service['apache'] - ] - }~> - Exec['systemctl-daemon-reload'] + require => Service['apache'], + notify => Exec['systemctl-daemon-reload'] + } } -- cgit v1.2.3 From 740734a79b143b572da440e203dbadcb471f2e4e Mon Sep 17 00:00:00 2001 From: Tulio Casagrande Date: Tue, 17 Jan 2017 11:03:14 -0200 Subject: Rename extensions module to autorestart --- .../modules/site_apache/manifests/common/autorestart.pp | 15 +++++++++++++++ puppet/modules/site_apache/manifests/common/extensions.pp | 12 ------------ 2 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 puppet/modules/site_apache/manifests/common/autorestart.pp delete mode 100644 puppet/modules/site_apache/manifests/common/extensions.pp (limited to 'puppet/modules/site_apache/manifests/common') diff --git a/puppet/modules/site_apache/manifests/common/autorestart.pp b/puppet/modules/site_apache/manifests/common/autorestart.pp new file mode 100644 index 00000000..aa13d4ef --- /dev/null +++ b/puppet/modules/site_apache/manifests/common/autorestart.pp @@ -0,0 +1,15 @@ +# +# Adds autorestart extension to apache on crash +# +class site_apache::common::autorestart { + + include ::systemd + file { '/etc/systemd/system/apache2.service.d/autorestart.conf': + source => 'puppet:///modules/site_apache/autorestart.conf', + owner => 'root', + group => 'root', + mode => '0644', + require => Service['apache'], + notify => Exec['systemctl-daemon-reload'] + } +} diff --git a/puppet/modules/site_apache/manifests/common/extensions.pp b/puppet/modules/site_apache/manifests/common/extensions.pp deleted file mode 100644 index 6e489ce8..00000000 --- a/puppet/modules/site_apache/manifests/common/extensions.pp +++ /dev/null @@ -1,12 +0,0 @@ -class site_apache::common::extensions { - - include ::systemd - file { '/etc/systemd/system/apache2.service.d/auto_restart.conf': - source => 'puppet:///modules/site_apache/auto_restart.conf', - owner => 'root', - group => 'root', - mode => '0644', - require => Service['apache'], - notify => Exec['systemctl-daemon-reload'] - } -} -- cgit v1.2.3 From e1767f48c04a469f00a414c2bd85ec2ed0eceb7f Mon Sep 17 00:00:00 2001 From: Tulio Casagrande Date: Tue, 17 Jan 2017 14:26:27 -0200 Subject: Change autorestart to use systemd::unit_file --- puppet/modules/site_apache/manifests/common/autorestart.pp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'puppet/modules/site_apache/manifests/common') diff --git a/puppet/modules/site_apache/manifests/common/autorestart.pp b/puppet/modules/site_apache/manifests/common/autorestart.pp index aa13d4ef..f8213439 100644 --- a/puppet/modules/site_apache/manifests/common/autorestart.pp +++ b/puppet/modules/site_apache/manifests/common/autorestart.pp @@ -3,13 +3,8 @@ # class site_apache::common::autorestart { - include ::systemd - file { '/etc/systemd/system/apache2.service.d/autorestart.conf': + ::systemd::unit_file { '/etc/systemd/system/apache2.service.d/autorestart.conf': source => 'puppet:///modules/site_apache/autorestart.conf', - owner => 'root', - group => 'root', - mode => '0644', require => Service['apache'], - notify => Exec['systemctl-daemon-reload'] } } -- cgit v1.2.3 From c74a1f3c1eea0bb359bfa3bd7d6b37e720f9a991 Mon Sep 17 00:00:00 2001 From: Tulio Casagrande Date: Tue, 17 Jan 2017 15:18:30 -0200 Subject: Ensure the directory exists before creating the file with @aarni --- puppet/modules/site_apache/manifests/common/autorestart.pp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'puppet/modules/site_apache/manifests/common') diff --git a/puppet/modules/site_apache/manifests/common/autorestart.pp b/puppet/modules/site_apache/manifests/common/autorestart.pp index f8213439..0273f272 100644 --- a/puppet/modules/site_apache/manifests/common/autorestart.pp +++ b/puppet/modules/site_apache/manifests/common/autorestart.pp @@ -3,8 +3,16 @@ # class site_apache::common::autorestart { - ::systemd::unit_file { '/etc/systemd/system/apache2.service.d/autorestart.conf': + file { '/etc/systemd/system/apache2.service.d': + ensure => directory, + mode => '0755', + } + + ::systemd::unit_file { 'apache2.service.d/autorestart.conf': source => 'puppet:///modules/site_apache/autorestart.conf', - require => Service['apache'], + require => [ + File['/etc/systemd/system/apache2.service.d'], + Service['apache'], + ] } } -- cgit v1.2.3 From a38a421a17b199e2207bc0009cba6869d17d4c21 Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Tue, 4 Jul 2017 17:56:25 -0700 Subject: Ensure directory has proper owner/group (#8841) --- puppet/modules/site_apache/manifests/common/autorestart.pp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'puppet/modules/site_apache/manifests/common') diff --git a/puppet/modules/site_apache/manifests/common/autorestart.pp b/puppet/modules/site_apache/manifests/common/autorestart.pp index 0273f272..6d8c4c3a 100644 --- a/puppet/modules/site_apache/manifests/common/autorestart.pp +++ b/puppet/modules/site_apache/manifests/common/autorestart.pp @@ -5,6 +5,8 @@ class site_apache::common::autorestart { file { '/etc/systemd/system/apache2.service.d': ensure => directory, + owner => root, + group => root, mode => '0755', } -- cgit v1.2.3 From f9ff6afebde2fe037fc9a90928501ff1a8d4ccde Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Wed, 12 Jul 2017 13:29:06 -0700 Subject: bug: Set .placeholder to fix removal Add a .placeholder file so the directory doesn't get removed by deb-systemd-helper when a package runs a purge in its postrm. This is a work-around and fixes #8841. It probably wont be needed post-jessie. --- .../site_apache/manifests/common/autorestart.pp | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'puppet/modules/site_apache/manifests/common') diff --git a/puppet/modules/site_apache/manifests/common/autorestart.pp b/puppet/modules/site_apache/manifests/common/autorestart.pp index 6d8c4c3a..8b7b590d 100644 --- a/puppet/modules/site_apache/manifests/common/autorestart.pp +++ b/puppet/modules/site_apache/manifests/common/autorestart.pp @@ -3,11 +3,21 @@ # class site_apache::common::autorestart { - file { '/etc/systemd/system/apache2.service.d': - ensure => directory, - owner => root, - group => root, - mode => '0755', + file { + '/etc/systemd/system/apache2.service.d': + ensure => directory, + owner => 'root', + group => 'root', + mode => '0755'; + + # Add .placeholder file so directory doesn't get removed by + # deb-systemd-helper in a package removal postrm, see + # issue #8841 for more details. + '/etc/systemd/system/apache2.service.d/.placeholder': + ensure => file, + owner => 'root', + group => 'root', + mode => '0755'; } ::systemd::unit_file { 'apache2.service.d/autorestart.conf': -- cgit v1.2.3