Mwalker has uploaded a new change for review.
https://gerrit.wikimedia.org/r/149376
Change subject: All OCG servers should have syslog readable
......................................................................
All OCG servers should have syslog readable
... for now
Need to add this to the machine role though because having it in the
OCG module causes conflicts in labs where base::syslogs is already
defined.
Change-Id: I20f3977659783705b1f8174d329a2a609aaa123c
---
M manifests/site.pp
M modules/ocg/manifests/init.pp
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/76/149376/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 6e16989..d3a9eb3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2152,6 +2152,9 @@
class { 'role::ocg::production':
tmpfs_size => '5120M'
}
+ class { 'base::syslogs':
+ readable => true
+ }
}
node /^osm-cp100[1-4]\.wikimedia\.org$/ {
diff --git a/modules/ocg/manifests/init.pp b/modules/ocg/manifests/init.pp
index 84f2ab9..55802b0 100644
--- a/modules/ocg/manifests/init.pp
+++ b/modules/ocg/manifests/init.pp
@@ -190,9 +190,6 @@
# horrible hack to work around the fact that we can't currently add users
to
# group 'adm' alongside system user 'syslog', see RT: 7596
- file { '/var/log/syslog':
- mode => '0644',
- }
file { '/var/log/ocg/ocg.log':
mode => '0644',
}
--
To view, visit https://gerrit.wikimedia.org/r/149376
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I20f3977659783705b1f8174d329a2a609aaa123c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mwalker <mwal...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
