Dzahn has submitted this change and it was merged.
Change subject: smokeping: fix minor compiler warnings
......................................................................
smokeping: fix minor compiler warnings
WARNING: unquoted file mode
WARNING: ensure found on line but it's not the first attribute
...
Change-Id: Ia545d1331498eff9285e4097c03a4f1f898a470f
---
M modules/smokeping/manifests/config.pp
M modules/smokeping/manifests/init.pp
M modules/smokeping/manifests/web.pp
3 files changed, 5 insertions(+), 4 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/smokeping/manifests/config.pp
b/modules/smokeping/manifests/config.pp
index 2d6a1d1..951d7f1 100644
--- a/modules/smokeping/manifests/config.pp
+++ b/modules/smokeping/manifests/config.pp
@@ -2,12 +2,12 @@
Package['smokeping'] -> Class['smokeping::config']
file { '/etc/smokeping/config.d':
- require => Package['smokeping'],
ensure => directory,
+ require => Package['smokeping'],
recurse => true,
owner => 'root',
group => 'root',
- mode => 0444,
+ mode => '0444',
source => 'puppet:///modules/smokeping/config.d',
}
}
diff --git a/modules/smokeping/manifests/init.pp
b/modules/smokeping/manifests/init.pp
index dc1b12c..d1ba53c 100644
--- a/modules/smokeping/manifests/init.pp
+++ b/modules/smokeping/manifests/init.pp
@@ -12,8 +12,8 @@
}
service { 'smokeping':
+ ensure => running,
require => [ Package['smokeping'], File['/etc/smokeping/config.d'] ],
subscribe => File['/etc/smokeping/config.d'],
- ensure => running;
}
}
diff --git a/modules/smokeping/manifests/web.pp
b/modules/smokeping/manifests/web.pp
index 0c82bdb..5008784 100644
--- a/modules/smokeping/manifests/web.pp
+++ b/modules/smokeping/manifests/web.pp
@@ -8,7 +8,8 @@
include ::apache::mod::fcgid
@webserver::apache::site { 'smokeping.wikimedia.org':
- require => [Class['::apache::mod::fcgid'],
File['/usr/share/smokeping/www/smokeping.fcgi']],
+ require => [Class['::apache::mod::fcgid'],
+ File['/usr/share/smokeping/www/smokeping.fcgi']],
docroot => '/var/www',
custom => [
'AliasMatch ^/($|smokeping\.cgi)
/usr/share/smokeping/www/smokeping.fcgi',
--
To view, visit https://gerrit.wikimedia.org/r/179184
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia545d1331498eff9285e4097c03a4f1f898a470f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: RobH <r...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
