Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/54612
Change subject: puppet-lint: fix "two-space soft tabs not used on line" errors
......................................................................
puppet-lint: fix "two-space soft tabs not used on line" errors
Change-Id: Iefca85fa0f9d13c37f7b199bf39fc579b2022db4
---
M manifests/misc/icinga.pp
1 file changed, 19 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/12/54612/1
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index d1ad558..03b886b 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -247,7 +247,7 @@
mode => '0755';
# Script to purge resources for non-existent hosts
- '/usr/local/sbin/purge-nagios-resources.py':
+ '/usr/local/sbin/purge-nagios-resources.py':
source => 'puppet:///files/nagios/purge-nagios-resources.py',
owner => 'root',
group => 'root',
@@ -750,27 +750,30 @@
service { 'icinga':
ensure => running,
hasstatus => false,
- subscribe => [
File[$icinga::monitor::configuration::variables::puppet_files],
- File[$icinga::monitor::configuration::variables::static_files],
- File['/etc/icinga/puppet_services.cfg'],
- File['/etc/icinga/puppet_hostextinfo.cfg'],
- File['/etc/icinga/puppet_hosts.cfg']];
+ subscribe => [
+ File[$icinga::monitor::configuration::variables::puppet_files],
+ File[$icinga::monitor::configuration::variables::static_files],
+ File['/etc/icinga/puppet_services.cfg'],
+ File['/etc/icinga/puppet_hostextinfo.cfg'],
+ File['/etc/icinga/puppet_hosts.cfg']
+ ];
}
}
class icinga::monitor::snmp {
- file { '/etc/snmp/snmptrapd.conf':
+ file {
+ '/etc/snmp/snmptrapd.conf':
source => 'puppet:///files/snmp/snmptrapd.conf.icinga',
owner => 'root',
group => 'root',
mode => '0600';
- '/etc/snmp/snmptt.conf':
+ '/etc/snmp/snmptt.conf':
source => 'puppet:///files/snmp/snmptt.conf.icinga',
owner => 'root',
group => 'root',
mode => '0644';
- '/etc/init.d/snmptt':
+ '/etc/init.d/snmptt':
source => 'puppet:///files/snmp/snmptt.init',
owner => 'root',
group => 'root',
@@ -802,16 +805,18 @@
ensure => running,
hasstatus => false,
hasrestart => true,
- subscribe => [ File['/etc/snmp/snmptt.conf'],
- File['/etc/init.d/snmptt'],
- File['/etc/snmp/snmptrapd.conf']];
+ subscribe => [
+ File['/etc/snmp/snmptt.conf'],
+ File['/etc/init.d/snmptt'],
+ File['/etc/snmp/snmptrapd.conf']];
}
service { 'snmptrapd':
ensure => running,
hasstatus => false,
- subscribe => [ File['/etc/init.d/snmptrapd'],
- File['/etc/snmp/snmptrapd.conf']];
+ subscribe => [
+ File['/etc/init.d/snmptrapd'],
+ File['/etc/snmp/snmptrapd.conf']];
}
service { 'snmpd':
--
To view, visit https://gerrit.wikimedia.org/r/54612
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iefca85fa0f9d13c37f7b199bf39fc579b2022db4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
