Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/74562
Change subject: Clean-up of 'eventlogging::archive' class.
......................................................................
Clean-up of 'eventlogging::archive' class.
De-parametrize the class to make the module more resilient.
Change-Id: I4134ab8aa5b278d6b17fc8f1589da14440ed126b
---
M modules/eventlogging/manifests/archive.pp
M modules/eventlogging/manifests/init.pp
2 files changed, 10 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/62/74562/1
diff --git a/modules/eventlogging/manifests/archive.pp
b/modules/eventlogging/manifests/archive.pp
index fdcf7b2..a72cd53 100644
--- a/modules/eventlogging/manifests/archive.pp
+++ b/modules/eventlogging/manifests/archive.pp
@@ -1,12 +1,16 @@
-# Configures node to rotate event logs and serve archived logs via rsync
-class eventlogging::archive( $destinations ) {
-
+# == Class: eventlogging::archive
+#
+# This class creates log directories for EventLogging logs under the
+# /var/log hierarchy and provisions an Rsync server module that serves
+# log data to backup destinations.
+#
+class eventlogging::archive {
include rsync::server
file { [ '/var/log/eventlogging', '/var/log/eventlogging/archive' ]:
ensure => directory,
owner => 'eventlogging',
- group => 'wikidev',
+ group => 'eventlogging',
mode => '0664',
}
@@ -15,7 +19,7 @@
read_only => 'yes',
list => 'yes',
require => File['/var/log/eventlogging'],
- hosts_allow => $destinations,
+ hosts_allow => $::network::constants::all_networks,
}
file { '/etc/logrotate.d/eventlogging':
@@ -23,5 +27,4 @@
require => File['/var/log/eventlogging/archive'],
mode => '0444',
}
-
}
diff --git a/modules/eventlogging/manifests/init.pp
b/modules/eventlogging/manifests/init.pp
index 73e9d2e..cac5103 100644
--- a/modules/eventlogging/manifests/init.pp
+++ b/modules/eventlogging/manifests/init.pp
@@ -36,6 +36,7 @@
# EventLogging tasks.
#
class eventlogging {
+ include eventlogging::archive
include eventlogging::package
# EventLogging jobs set 'eventlogging' gid & uid.
--
To view, visit https://gerrit.wikimedia.org/r/74562
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4134ab8aa5b278d6b17fc8f1589da14440ed126b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
