From 00597b43442ab52e5a293837bf73274fb40e6655 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Tue, 18 Apr 2017 21:12:15 +0200 Subject: [PATCH] Always set permissions of apache2 log directory --- modules/apache2/manifests/init.pp | 4 ++++ modules/roles/manifests/weblog_provider.pp | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/apache2/manifests/init.pp b/modules/apache2/manifests/init.pp index b0bde4134..f279cde4c 100644 --- a/modules/apache2/manifests/init.pp +++ b/modules/apache2/manifests/init.pp @@ -132,6 +132,10 @@ class apache2 { content => template('apache2/disabled-index.html'), } + file { '/var/log/apache2': + ensure => directory, + mode => '0755', + } file { '/var/log/apache2/.nobackup': mode => '0644', content => '', diff --git a/modules/roles/manifests/weblog_provider.pp b/modules/roles/manifests/weblog_provider.pp index 30c4d5f1f..df5060209 100644 --- a/modules/roles/manifests/weblog_provider.pp +++ b/modules/roles/manifests/weblog_provider.pp @@ -5,10 +5,6 @@ class roles::weblog_provider { onlyif => '/usr/bin/getent passwd weblogsync > /dev/null && ! [ -e /home/weblogsync/.ssh/id_rsa ]' } } else { - file { '/var/log/apache2': - ensure => directory, - mode => '0755', - } file { '/etc/cron.d/puppet-weblog-provider': content => "SHELL=/bin/bash\n\n0 1 * * * weblogsync sleep $((RANDOM \% 1800)); rsync -a --delete-excluded --include 'www.debian.org-access.log-*gz' --include '*-public-access.log-*gz' --exclude '**' /var/log/apache2/. weblogsync@wolkenstein.debian.org:-weblogs-incoming-\n", } -- 2.20.1