Ottomata has submitted this change and it was merged.
Change subject: Turn EventLogging's logrotate config into template
......................................................................
Turn EventLogging's logrotate config into template
EventLogging's logrotate config uses variables since
eed057682ed856a4489f95d274c072e58fe64ff0
but is still included as file, so the variables are not rendered with
their values. Hence, we turn the file into a template.
Change-Id: Iad0d9982cee45a9ae1f423d7100eaccca6d7a20e
---
M modules/eventlogging/manifests/init.pp
R modules/eventlogging/templates/logrotate.erb
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Ottomata: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/eventlogging/manifests/init.pp
b/modules/eventlogging/manifests/init.pp
index a4c0f72..55017d5 100644
--- a/modules/eventlogging/manifests/init.pp
+++ b/modules/eventlogging/manifests/init.pp
@@ -125,7 +125,7 @@
}
file { '/etc/logrotate.d/eventlogging':
- source => 'puppet:///modules/eventlogging/logrotate',
+ content => template('eventlogging/logrotate.erb'),
require => File["${log_dir}/archive"],
mode => '0444',
}
diff --git a/modules/eventlogging/files/logrotate
b/modules/eventlogging/templates/logrotate.erb
similarity index 89%
rename from modules/eventlogging/files/logrotate
rename to modules/eventlogging/templates/logrotate.erb
index a5834e7..15c56e8 100644
--- a/modules/eventlogging/files/logrotate
+++ b/modules/eventlogging/templates/logrotate.erb
@@ -1,7 +1,7 @@
# This file is managed by Puppet.
# puppet:///modules/eventlogging/logrotate
-<%= @log_dir =>/*.log {
+<%= @log_dir %>/*.log {
daily
olddir <%= @log_dir %>/archive
notifempty
--
To view, visit https://gerrit.wikimedia.org/r/173065
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iad0d9982cee45a9ae1f423d7100eaccca6d7a20e
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: QChris <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
