Akosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/95631
Change subject: misc::udp2log owner/perms fixups
......................................................................
misc::udp2log owner/perms fixups
Plus some whitespace cleanups
Change-Id: Ia50a865ba2c5c3bac709c826ba1a77f5cbdfe672
---
M manifests/misc/udp2log.pp
1 file changed, 14 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/31/95631/1
diff --git a/manifests/misc/udp2log.pp b/manifests/misc/udp2log.pp
index 4944e74..d335bff 100644
--- a/manifests/misc/udp2log.pp
+++ b/manifests/misc/udp2log.pp
@@ -1,6 +1,5 @@
-
# Class: udp2log
-#
+#
# Includes packages and setup for misc::udp2log::instances.
# Make sure you include this class if you plan on using
# the misc::udp2log::instance define below.
@@ -9,7 +8,7 @@
# $monitor - If true, monitoring scripts will be installed. Default: true
class misc::udp2log($monitor = true) {
- include
+ include
contacts::udp2log,
misc::udp2log::udp_filter
@@ -23,7 +22,7 @@
# include the monitoring scripts
# required for monitoring udp2log instances
if $monitor {
- include
+ include
# TODO: Should probably include icincga package here.
misc::udp2log::monitoring,
misc::udp2log::iptables
@@ -340,13 +339,19 @@
# send udp2log socket stats to ganglia.
file {
'/usr/lib/ganglia/python_modules/udp2log_socket.py':
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ source =>
'puppet:///files/ganglia/plugins/udp2log_socket.py',
require => File['/usr/lib/ganglia/python_modules'],
- source =>
'puppet:///files/ganglia/plugins/udp2log_socket.py',
- notify => Service['gmond'];
+ notify => Service['gmond'];
'/etc/ganglia/conf.d/udp2log_socket.pyconf':
- require =>
File["/usr/lib/ganglia/python_modules/udp2log_socket.py"],
- source =>
"puppet:///files/ganglia/plugins/udp2log_socket.pyconf",
- notify => Service['gmond'];
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ source =>
'puppet:///files/ganglia/plugins/udp2log_socket.pyconf',
+ require =>
File['/usr/lib/ganglia/python_modules/udp2log_socket.py'],
+ notify => Service['gmond'];
}
# include general UDP statistic monitoring.
--
To view, visit https://gerrit.wikimedia.org/r/95631
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia50a865ba2c5c3bac709c826ba1a77f5cbdfe672
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Akosiaris <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
