RobH has uploaded a new change for review.
https://gerrit.wikimedia.org/r/65429
Change subject: bringing racktables stuff to style guide standard
......................................................................
bringing racktables stuff to style guide standard
Change-Id: I710d63297a68c98c62abbb7dfa97e3dbc7f388d7
---
M manifests/misc/racktables.pp
M manifests/role/racktables.pp
M manifests/site.pp
3 files changed, 55 insertions(+), 55 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/29/65429/1
diff --git a/manifests/misc/racktables.pp b/manifests/misc/racktables.pp
index f6cb481..b51d421 100644
--- a/manifests/misc/racktables.pp
+++ b/manifests/misc/racktables.pp
@@ -2,20 +2,20 @@
class misc::racktables {
- include generic::mysql::packages::client,
- passwords::racktables
+ include generic::mysql::packages::client,
+ passwords::racktables
- # variables
- $racktables_db_host = 'db1001.eqiad.wmnet'
- $racktables_db = 'racktables'
+ # variables
+ $racktables_db_host = 'db1001.eqiad.wmnet'
+ $racktables_db = 'racktables'
- file {
- '/srv/org/wikimedia/racktables/wwwroot/inc/secret.php':
- ensure => present,
- mode => '0444',
- owner => 'root',
- group => 'root',
- content => template('racktables/racktables.config.erb');
- }
+ file {
+ '/srv/org/wikimedia/racktables/wwwroot/inc/secret.php':
+ ensure => present,
+ mode => '0444',
+ owner => 'root',
+ group => 'root',
+ content => template('racktables/racktables.config.erb');
+ }
}
\ No newline at end of file
diff --git a/manifests/role/racktables.pp b/manifests/role/racktables.pp
index 0827bfb..18d3676 100644
--- a/manifests/role/racktables.pp
+++ b/manifests/role/racktables.pp
@@ -7,52 +7,52 @@
class role::racktables {
- system_role { 'role::racktables': description => 'Racktables' }
+ system_role { 'role::racktables': description => 'Racktables' }
- include standard-noexim, webserver::php5-gd,
- webserver::php5-mysql,
- misc::racktables
+ include standard-noexim, webserver::php5-gd,
+ webserver::php5-mysql,
+ misc::racktables
- if ! defined(Class["webserver::php5"]) {
- class {'webserver::php5': ssl => true; }
- }
+ if ! defined(Class['webserver::php5']) {
+ class {'webserver::php5': ssl => true; }
+ }
- # dependencies
- Class['webserver::php5'] -> apache_module['rewrite']
+ # dependencies
+ Class['webserver::php5'] -> apache_module['rewrite']
- # be flexible about labs vs. prod
- case $::realm {
- labs: {
- $racktables_host = "${instancename}.${domain}"
- $racktables_ssl_cert = '/etc/ssl/certs/star.wmflabs.pem'
- $racktables_ssl_key =
'/etc/ssl/private/star.wmflabs.key'
- install_certificate{ 'star.wmflabs.org': }
- }
- production: {
- $racktables_host = 'racktables.wikimedia.org'
- $racktables_ssl_cert =
'/etc/ssl/certs/star.wikimedia.org.pem'
- $racktables_ssl_key =
'/etc/ssl/private/star.wikimedia.org.key'
- install_certificate{ 'star.wikimedia.org': }
- }
- default: {
- fail('unknown realm, should be labs or production')
- }
- }
+ # be flexible about labs vs. prod
+ case $::realm {
+ labs: {
+ $racktables_host = "${instancename}.${domain}"
+ $racktables_ssl_cert = '/etc/ssl/certs/star.wmflabs.pem'
+ $racktables_ssl_key = '/etc/ssl/private/star.wmflabs.key'
+ install_certificate{ 'star.wmflabs.org': }
+ }
+ production: {
+ $racktables_host = 'racktables.wikimedia.org'
+ $racktables_ssl_cert = '/etc/ssl/certs/star.wikimedia.org.pem'
+ $racktables_ssl_key = '/etc/ssl/private/star.wikimedia.org.key'
+ install_certificate{ 'star.wikimedia.org': }
+ }
+ default: {
+ fail('unknown realm, should be labs or production')
+ }
+ }
- file {
- "/etc/apache2/sites-available/${racktables_host}":
- ensure => present,
- mode => '0444',
- owner => 'root',
- group => 'root',
- notify => Service['apache2'],
- content =>
template('apache/sites/racktables.wikimedia.org.erb');
- }
+ file {
+ "/etc/apache2/sites-available/${racktables_host}":
+ ensure => present,
+ mode => '0444',
+ owner => 'root',
+ group => 'root',
+ notify => Service['apache2'],
+ content => template('apache/sites/racktables.wikimedia.org.erb');
+ }
- apache_site { 'racktables': name => "${racktables_host}" }
- apache_confd { 'namevirtualhost': install => true, name =>
'namevirtualhost' }
- apache_module { 'rewrite': name => 'rewrite' }
+ apache_site { 'racktables': name => "${racktables_host}" }
+ apache_confd {'namevirtualhost': install => true, name =>
'namevirtualhost'}
+ apache_module { 'rewrite': name => 'rewrite' }
diff --git a/manifests/site.pp b/manifests/site.pp
index 1ec25d4..28b8823 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1595,10 +1595,10 @@
node "magnesium.wikimedia.org" {
- $cluster = "misc"
+ $cluster = "misc"
- include role::racktables
- include role::request-tracker-apache::production, exim::rt
+ include role::racktables
+ include role::request-tracker-apache::production, exim::rt
}
node "marmontel.wikimedia.org" {
--
To view, visit https://gerrit.wikimedia.org/r/65429
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I710d63297a68c98c62abbb7dfa97e3dbc7f388d7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: RobH <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
