Ori.livneh has submitted this change and it was merged.
Change subject: Fix Kibana init.pp file location
......................................................................
Fix Kibana init.pp file location
The file should have been nested under manifests/. Follows I504c4c124.
Also includes some minor tweaks to formatting, comments, and parameter order.
Change-Id: I33c0967470dd53519921326c17739e675b80d307
---
M manifests/role/kibana.pp
R modules/kibana/manifests/init.pp
2 files changed, 7 insertions(+), 11 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/manifests/role/kibana.pp b/manifests/role/kibana.pp
index 8652ac7..d3c459a 100644
--- a/manifests/role/kibana.pp
+++ b/manifests/role/kibana.pp
@@ -45,4 +45,3 @@
notify => Service['httpd'],
}
}
-
diff --git a/modules/kibana/init.pp b/modules/kibana/manifests/init.pp
similarity index 62%
rename from modules/kibana/init.pp
rename to modules/kibana/manifests/init.pp
index 82c3f60..2f6edcb 100644
--- a/modules/kibana/init.pp
+++ b/modules/kibana/manifests/init.pp
@@ -1,26 +1,23 @@
-# vim:sw=4 ts=4 sts=4 et:
-
-# = Class: kibana
+# == Class: kibana
#
-# This class installs/configures/manages the Kibana application.
+# Kibana is a JavaScript web application for visualizing log data and other
+# types of time-stamped data. It integrates with ElasticSearch and LogStash.
#
-class kibana() {
- # Trebuchet deployment
+class kibana {
deployment::target { 'kibana': }
file { '/etc/kibana':
ensure => directory,
- mode => '0755',
owner => 'root',
group => 'root',
+ mode => '0755',
}
file { '/etc/kibana/config.js':
ensure => present,
- mode => '0444',
+ source => 'puppet:///modules/kibana/config.js',
owner => 'root',
group => 'root',
- source => 'puppet:///modules/kibana/config.js',
- require => File['/etc/kibana'],
+ mode => '0644',
}
}
--
To view, visit https://gerrit.wikimedia.org/r/107544
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I33c0967470dd53519921326c17739e675b80d307
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
