Matanya has uploaded a new change for review.
https://gerrit.wikimedia.org/r/139786
Change subject: torrus: lint
......................................................................
torrus: lint
Change-Id: Id7c918333c4b16fcebf8c9fa348e515a62a34c2d
---
M manifests/misc/torrus.pp
1 file changed, 177 insertions(+), 164 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/86/139786/1
diff --git a/manifests/misc/torrus.pp b/manifests/misc/torrus.pp
index 1ccb494..87ed04d 100644
--- a/manifests/misc/torrus.pp
+++ b/manifests/misc/torrus.pp
@@ -1,179 +1,192 @@
# misc/torrus.pp
class misc::torrus {
- system::role { "misc::torrus": description => "Torrus" }
+ system::role { 'misc::torrus':
+ description => 'Torrus',
+ }
- package {
- "torrus-common":
- ensure => latest;
- }
+ package { 'torrus-common':
+ ensure => latest,
+ }
- class web {
- package { "torrus-apache2":
- before => Class[webserver::apache::service],
- ensure => latest
- }
+ class web {
+ package { 'torrus-apache2':
+ ensure => latest,
+ before => Class['webserver::apache::service'],
+ }
- @webserver::apache::module { "perl": }
- # This is an ugly ugly workaround to other classes also
- # declaring a use of the rewrite module. Case in hand is
librenms on
- # netmon1001
- if !defined(Webserver::Apache::Module['rewrite']) {
- @webserver::apache::module { "rewrite": }
- }
- @webserver::apache::site { "torrus.wikimedia.org":
- require => Webserver::Apache::Module[["perl",
"rewrite"]],
- docroot => "/var/www",
- custom => ["RedirectMatch ^/$ /torrus"],
- includes => ["/etc/torrus/torrus-apache2.conf"]
- }
- }
+ @webserver::apache::module { 'perl': }
+ # This is an ugly ugly workaround to other classes also
+ # declaring a use of the rewrite module. Case in hand is librenms on
+ # netmon1001
+ if !defined(Webserver::Apache::Module['rewrite']) {
+ @webserver::apache::module { 'rewrite': }
+ }
+ @webserver::apache::site { 'torrus.wikimedia.org':
+ require => Webserver::Apache::Module[['perl', 'rewrite']],
+ docroot => '/var/www',
+ custom => ['RedirectMatch ^/$ /torrus'],
+ includes => ['/etc/torrus/torrus-apache2.conf'],
+ }
+ }
- class config {
- File { require => Package["torrus-common"] }
+ class config {
+ File { require => Package['torrus-common'] }
- file {
- "/etc/torrus/conf/":
- source => "puppet:///files/torrus/conf/",
- owner => root,
- group => root,
- mode => 0444,
- recurse => remote;
- "/etc/torrus/templates/":
- source => "puppet:///files/torrus/templates/",
- owner => root,
- group => root,
- mode => 0444,
- recurse => remote;
- "/usr/share/torrus/sup/webplain/wikimedia.css":
- owner => root,
- group => root,
- mode => 0444,
- source =>
"puppet:///files/torrus/wikimedia.css";
- }
- }
+ file { '/etc/torrus/conf/':
+ source => 'puppet:///files/torrus/conf/',
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ recurse => remote,
+ }
- exec {
- "torrus clearcache":
- command => "/usr/sbin/torrus clearcache",
- require => Class[misc::torrus::config],
- subscribe => Class[misc::torrus::config],
- logoutput => true,
- refreshonly => true,
- before => Exec["torrus compile"];
- "torrus compile":
- command => "/usr/sbin/torrus compile --all",
- require => Class[ [misc::torrus::config,
misc::torrus::xmlconfig] ],
- subscribe => Class[ [misc::torrus::config,
misc::torrus::xmlconfig] ],
- logoutput => true,
- refreshonly => true
- }
+ file { '/etc/torrus/templates/':
+ source => 'puppet:///files/torrus/templates/',
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ recurse => remote,
+ }
- service { "torrus-common":
- require => Exec["torrus compile"],
- subscribe => File[ ["/etc/torrus/conf/",
"/etc/torrus/templates/"]],
- hasrestart => false,
- ensure => running;
- }
+ file { '/usr/share/torrus/sup/webplain/wikimedia.css':
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ source => 'puppet:///files/torrus/wikimedia.css',
+ }
+ }
- class xmlconfig {
- require misc::torrus::config
- include passwords::network
+ exec { 'torrus clearcache':
+ command => '/usr/sbin/torrus clearcache',
+ require => Class['misc::torrus::config'],
+ subscribe => Class['misc::torrus::config'],
+ logoutput => true,
+ refreshonly => true,
+ before => Exec['torrus compile'],
+ }
- file {
- "/etc/torrus/xmlconfig/":
- source => "puppet:///files/torrus/xmlconfig/",
- owner => root,
- group => root,
- mode => 0444,
- recurse => remote;
- "/etc/torrus/xmlconfig/site-global.xml":
- owner => root,
- group => root,
- mode => 0444,
- content =>
template("torrus/site-global.xml.erb");
- }
- }
+ exec { 'torrus compile':
+ command => '/usr/sbin/torrus compile --all',
+ require => Class['misc::torrus::config, misc::torrus::xmlconfig'],
+ subscribe => Class['misc::torrus::config, misc::torrus::xmlconfig'],
+ logoutput => true,
+ refreshonly => true,
+ }
- class discovery {
- require misc::torrus::config, misc::torrus::xmlconfig
-
- # Definition: misc::torrus::discovery
- #
- # This definition generates a torrus discovery DDX file, which
Torrus
- # will use to compile its XML config files from SNMP
- #
- # Parameters:
- # - $subtree: the Torrus subtree path used in the XML
config file
- # - $domain: The domain name to use for SNMP host names
- # - $snmp_community: The SNMP community needed to query
- # - $hosts: A list of hosts
- define ddxfile($subtree, $domain="", $snmp_community="public",
$hosts=[]) {
- file { "/etc/torrus/discovery/${title}.ddx":
- require => File["/etc/torrus/discovery"],
- content => template("torrus/generic.ddx.erb"),
- owner => root,
- group => root,
- mode => 0444,
- before => Exec[torrus-discovery],
- notify => Exec[torrus-discovery];
- }
- }
-
- file {
- "/etc/torrus/discovery":
- owner => root,
- group => root,
- mode => 0750,
- ensure => directory;
- "/etc/cron.daily/torrus-discovery":
- source =>
"puppet:///files/torrus/torrus-discovery",
- owner => root,
- group => root,
- mode => 0550;
- }
-
- exec { "torrus-discovery":
- require => File["/etc/cron.daily/torrus-discovery"],
- command => "/etc/cron.daily/torrus-discovery",
- timeout => 1800,
- refreshonly => true,
- before => Exec["torrus compile"];
- }
- }
-
- class xml-generation {
- # Class: misc::torrus::xml-generation::cdn
- #
- # This class automatically generates XML files for
- # Squid and Varnish servers
- #
- # Uses role/cache/cache.pp
- class cdn {
- require role::cache::configuration
+ service { 'torrus-common':
+ ensure => running,
+ require => Exec['torrus compile'],
+ subscribe => File[ ['/etc/torrus/conf/', '/etc/torrus/templates/']],
+ hasrestart => false,
+ }
- File {
- owner => root,
- group => root,
- mode => 0444,
- notify => Exec["torrus compile --tree=CDN"]
- }
- file {
- "/etc/torrus/xmlconfig/varnish.xml":
- content =>
template("torrus/varnish.xml.erb");
- "/etc/torrus/xmlconfig/squid.xml":
- content =>
template("torrus/squid.xml.erb");
- "/etc/torrus/xmlconfig/cdn-aggregates.xml":
- content =>
template("torrus/cdn-aggregates.xml.erb");
- }
-
- exec { "torrus compile --tree=CDN":
- path => "/bin:/sbin:/usr/bin:/usr/sbin",
- logoutput => true,
- refreshonly => true;
- }
- }
- }
-
- include xmlconfig, discovery
+ class xmlconfig {
+ require misc::torrus::config
+ include passwords::network
+
+ file { '/etc/torrus/xmlconfig/':
+ source => 'puppet:///files/torrus/xmlconfig/',
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ recurse => remote,
+ }
+
+ file { '/etc/torrus/xmlconfig/site-global.xml':
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ content => template('torrus/site-global.xml.erb'),
+ }
+ }
+
+ class discovery {
+ require misc::torrus::config
+ require misc::torrus::xmlconfig
+
+ # Definition: misc::torrus::discovery
+ #
+ # This definition generates a torrus discovery DDX file, which Torrus
+ # will use to compile its XML config files from SNMP
+ #
+ # Parameters:
+ # - $subtree: the Torrus subtree path used in the XML config file
+ # - $domain: The domain name to use for SNMP host names
+ # - $snmp_community: The SNMP community needed to query
+ # - $hosts: A list of hosts
+ define ddxfile( $subtree,
+ $domain= '',
+ $snmp_community= 'public',
+ $hosts= [],
+ ) {
+ file { "/etc/torrus/discovery/${title}.ddx":
+ require => File['/etc/torrus/discovery'],
+ content => template('torrus/generic.ddx.erb'),
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ before => Exec['torrus-discovery'],
+ notify => Exec['torrus-discovery'],
+ }
+ }
+
+ file { '/etc/torrus/discovery':
+ ensure => 'directory',
+ owner => 'root',
+ group => 'root',
+ mode => '0750',
+ }
+
+ file { '/etc/cron.daily/torrus-discovery':
+ source => 'puppet:///files/torrus/torrus-discovery',
+ owner => 'root',
+ group => 'root',
+ mode => '0550',
+ }
+
+ exec { 'torrus-discovery':
+ require => File['/etc/cron.daily/torrus-discovery'],
+ command => '/etc/cron.daily/torrus-discovery',
+ timeout => 1800,
+ refreshonly => true,
+ before => Exec['torrus compile'],
+ }
+ }
+
+ class xml-generation {
+ # Class: misc::torrus::xml-generation::cdn
+ #
+ # This class automatically generates XML files for
+ # Squid and Varnish servers
+ #
+ # Uses role/cache/cache.pp
+ class cdn {
+ require role::cache::configuration
+
+ File {
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ notify => Exec['torrus compile --tree=CDN'],
+ }
+ file { '/etc/torrus/xmlconfig/varnish.xml':
+ content => template('torrus/varnish.xml.erb'),
+ }
+ file { '/etc/torrus/xmlconfig/squid.xml':
+ content => template('torrus/squid.xml.erb'),
+ }
+ file { '/etc/torrus/xmlconfig/cdn-aggregates.xml':
+ content => template('torrus/cdn-aggregates.xml.erb'),
+ }
+
+ exec { 'torrus compile --tree=CDN':
+ path => '/bin:/sbin:/usr/bin:/usr/sbin',
+ logoutput => true,
+ refreshonly => true,
+ }
+ }
+ }
+ include xmlconfig
+ include discovery
}
--
To view, visit https://gerrit.wikimedia.org/r/139786
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id7c918333c4b16fcebf8c9fa348e515a62a34c2d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
