jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/361429 )
Change subject: Fix logrotate permissions
......................................................................
Fix logrotate permissions
/vagrant/logs/ is owned by vagrant:vagrant (has to be as it's shared
with the host machine) which results in errors like
error: skipping "/vagrant/logs/foo.log" because parent directory
has insecure permissions (It's world writable or writable by group
which is not "root") Set "su" directive in config file to tell
logrotate which user/group should be used for rotation.
Ownership of the log directory needs to be specified manually
to avoid that.
Change-Id: I74907dc696e05cb3db23441056e30ade25b73e9c
---
M puppet/modules/mediawiki/files/wiki/logrotate.d-mediawiki-shared-log-groups
M puppet/modules/mediawiki/templates/logrotate.d-mediawiki-debug-log.erb
M puppet/modules/role/files/flow/logrotate.d-mediawiki-Flow
M puppet/modules/service/templates/logrotate.erb
M puppet/modules/statsd/templates/logrotate.erb
5 files changed, 5 insertions(+), 0 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/puppet/modules/mediawiki/files/wiki/logrotate.d-mediawiki-shared-log-groups
b/puppet/modules/mediawiki/files/wiki/logrotate.d-mediawiki-shared-log-groups
index f67cdd5..c65bfa5 100644
---
a/puppet/modules/mediawiki/files/wiki/logrotate.d-mediawiki-shared-log-groups
+++
b/puppet/modules/mediawiki/files/wiki/logrotate.d-mediawiki-shared-log-groups
@@ -3,6 +3,7 @@
# This file is managed by Puppet
/vagrant/logs/mediawiki-exception.log /vagrant/logs/mediawiki-runJobs.log
/vagrant/logs/mediawiki-JobQueueRedis.log {
+ su vagrant vagrant
daily
missingok
rotate 7
diff --git
a/puppet/modules/mediawiki/templates/logrotate.d-mediawiki-debug-log.erb
b/puppet/modules/mediawiki/templates/logrotate.d-mediawiki-debug-log.erb
index 49fdafa..21e405c 100644
--- a/puppet/modules/mediawiki/templates/logrotate.d-mediawiki-debug-log.erb
+++ b/puppet/modules/mediawiki/templates/logrotate.d-mediawiki-debug-log.erb
@@ -2,6 +2,7 @@
# This file is managed by Puppet
<%= @debug_log_file %> {
+ su vagrant vagrant
daily
missingok
rotate 7
diff --git a/puppet/modules/role/files/flow/logrotate.d-mediawiki-Flow
b/puppet/modules/role/files/flow/logrotate.d-mediawiki-Flow
index 8fc92c0..e4a7129 100644
--- a/puppet/modules/role/files/flow/logrotate.d-mediawiki-Flow
+++ b/puppet/modules/role/files/flow/logrotate.d-mediawiki-Flow
@@ -1,6 +1,7 @@
# This file is managed by Puppet
/vagrant/logs/mediawiki-Flow.log {
+ su vagrant vagrant
daily
missingok
rotate 7
diff --git a/puppet/modules/service/templates/logrotate.erb
b/puppet/modules/service/templates/logrotate.erb
index 70a0f9a..4f267a3 100644
--- a/puppet/modules/service/templates/logrotate.erb
+++ b/puppet/modules/service/templates/logrotate.erb
@@ -1,6 +1,7 @@
# logrotate(8) config for <%= @title %>
<%= @log_file %> {
+ su vagrant vagrant
daily
copytruncate
missingok
diff --git a/puppet/modules/statsd/templates/logrotate.erb
b/puppet/modules/statsd/templates/logrotate.erb
index 8d93413..44d4c97 100644
--- a/puppet/modules/statsd/templates/logrotate.erb
+++ b/puppet/modules/statsd/templates/logrotate.erb
@@ -1,6 +1,7 @@
# logrotate(8) config for statsd
"<%= @logdir %>/statsd.log" {
+ su vagrant vagrant
daily
copytruncate
missingok
--
To view, visit https://gerrit.wikimedia.org/r/361429
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I74907dc696e05cb3db23441056e30ade25b73e9c
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza <gti...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Dduvall <dduv...@wikimedia.org>
Gerrit-Reviewer: Mattflaschen <mflasc...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
