Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: hhvm: add su directive to logrotate recipe
......................................................................
hhvm: add su directive to logrotate recipe
Our current recipe was causing an error to be thrown on Debian jessie.
Bug: T137689
Change-Id: Id29373f7e36c1ebd90216e1e800b678ffe210ff5
---
M modules/hhvm/manifests/init.pp
R modules/hhvm/templates/hhvm.logrotate.erb
2 files changed, 3 insertions(+), 1 deletion(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/hhvm/manifests/init.pp b/modules/hhvm/manifests/init.pp
index 6a39d77..0a2eb74 100644
--- a/modules/hhvm/manifests/init.pp
+++ b/modules/hhvm/manifests/init.pp
@@ -274,7 +274,7 @@
}
file { '/etc/logrotate.d/hhvm':
- source => 'puppet:///modules/hhvm/hhvm.logrotate',
+ content => template('hhvm/hhvm.logrotate.erb'),
owner => 'root',
group => 'root',
mode => '0444',
diff --git a/modules/hhvm/files/hhvm.logrotate
b/modules/hhvm/templates/hhvm.logrotate.erb
similarity index 86%
rename from modules/hhvm/files/hhvm.logrotate
rename to modules/hhvm/templates/hhvm.logrotate.erb
index e0129e5..765508e 100644
--- a/modules/hhvm/files/hhvm.logrotate
+++ b/modules/hhvm/templates/hhvm.logrotate.erb
@@ -3,6 +3,7 @@
# HHVM's error log, managed by rsyslog.
/var/log/hhvm/error.log {
+ su <%= @user %> <%= @group %>
daily
dateext
dateyesterday
@@ -18,6 +19,7 @@
# Delete local stack trace logs after one week.
/var/log/hhvm/stacktrace.*.log.* {
+ su <%= @user %> <%= @group %>
rotate 0
maxage 7
missingok
--
To view, visit https://gerrit.wikimedia.org/r/294311
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id29373f7e36c1ebd90216e1e800b678ffe210ff5
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Ema <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
