ArielGlenn has submitted this change and it was merged.
Change subject: remove htpasswd from icinga config, not used (see r51315)
......................................................................
remove htpasswd from icinga config, not used (see r51315)
Change-Id: Ia2f64379eb24f8de633ec31a9840e7ffb85d8eaa
---
M manifests/misc/icinga.pp
1 file changed, 1 insertion(+), 8 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index d06aa84..3950b02 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -80,8 +80,7 @@
"${icinga::monitor::configuration::variables::icinga_config_dir}/contacts.cfg",
"${icinga::monitor::configuration::variables::icinga_config_dir}/misccommands.cfg",
"${icinga::monitor::configuration::variables::icinga_config_dir}/resource.cfg",
-
"${icinga::monitor::configuration::variables::icinga_config_dir}/timeperiods.cfg",
-
"${icinga::monitor::configuration::variables::icinga_config_dir}/htpasswd.users"]
+
"${icinga::monitor::configuration::variables::icinga_config_dir}/timeperiods.cfg"]
}
class icinga::monitor::apache {
@@ -167,12 +166,6 @@
'/etc/icinga/nsca_frack.cfg':
source => 'puppet:///private/nagios/nsca_frack.cfg',
- owner => 'root',
- group => 'root',
- mode => '0644';
-
- '/etc/icinga/htpasswd.users':
- source => 'puppet:///private/nagios/htpasswd.users',
owner => 'root',
group => 'root',
mode => '0644';
--
To view, visit https://gerrit.wikimedia.org/r/91367
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2f64379eb24f8de633ec31a9840e7ffb85d8eaa
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
