Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/96354
Change subject: tabbing, quoting & aligning
......................................................................
tabbing, quoting & aligning
fix usual puppet-lint stuff like:
- unquoted resource titles
- aligned arrows
- double-quotes where there are no variables
- $realm should be top-scope $::realm
..
Yeah, i know we're probably dropping etherpad-old,
but i just did the whole file..
Change-Id: Iac87c642d4b421a51edabdbc2ae6981cebb0cb28
---
M manifests/misc/etherpad.pp
1 file changed, 98 insertions(+), 97 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/54/96354/1
diff --git a/manifests/misc/etherpad.pp b/manifests/misc/etherpad.pp
index c20e55e..46a5b5a 100644
--- a/manifests/misc/etherpad.pp
+++ b/manifests/misc/etherpad.pp
@@ -2,124 +2,125 @@
class misc::etherpad {
- include passwords::etherpad
- $etherpad_admin_pass = $passwords::etherpad::etherpad_admin_pass
- $etherpad_sql_pass = $passwords::etherpad::etherpad_sql_pass
+ include passwords::etherpad
+ $etherpad_admin_pass = $passwords::etherpad::etherpad_admin_pass
+ $etherpad_sql_pass = $passwords::etherpad::etherpad_sql_pass
- system::role { "misc::etherpad": description => "Etherpad server" }
+ system::role { 'misc::etherpad': description => 'Etherpad server' }
- require webserver::modproxy
+ require webserver::modproxy
- # NB: this has some GUI going on all up in it. first install must be
done by hand.
- package { etherpad:
- ensure => latest;
- }
+ # NB: this has some GUI going on all up in it. first install must be done
by hand.
+ package { 'etherpad':
+ ensure => latest;
+ }
- service { etherpad:
- require => Package[etherpad],
- ensure => running;
- }
+ service { 'etherpad':
+ ensure => running,
+ require => Package['etherpad'];
+ }
- file {
- "/etc/init.d/etherpad":
- source => "puppet:///files/misc/etherpad/etherpad.init",
- mode => 0555,
- owner => root,
- group => root;
- "/etc/apache2/sites-available/etherpad.proxy":
- source =>
"puppet:///files/misc/etherpad/etherpad.proxy.apache.conf",
- mode => 0444,
- owner => root,
- group => root;
- "/etc/etherpad/etherpad.local.properties":
- content =>
template("etherpad/etherpad.local.properties.erb"),
- mode => 0444,
- owner => root,
- group => root;
- }
+ file {
+ '/etc/init.d/etherpad':
+ source => 'puppet:///files/misc/etherpad/etherpad.init',
+ mode => '0555',
+ owner => 'root',
+ group => 'root';
+ '/etc/apache2/sites-available/etherpad.proxy':
+ source =>
'puppet:///files/misc/etherpad/etherpad.proxy.apache.conf',
+ mode => '0444',
+ owner => 'root',
+ group => 'root';
+ '/etc/etherpad/etherpad.local.properties':
+ content => template('etherpad/etherpad.local.properties.erb'),
+ mode => '0444',
+ owner => 'root',
+ group => 'root';
+ }
- apache_module { proxy: name => "proxy" }
- apache_site { etherpad_proxy: name => "etherpad.proxy" }
+ apache_module { 'proxy': name => 'proxy' }
- # Nagios monitoring
- monitor_service { "etherpad http":
- description => "Etherpad HTTP",
- check_command => "check_http_on_port!9000";
- }
+ apache_site { 'etherpad_proxy': name => 'etherpad.proxy'}
+
+ # Nagios monitoring
+ monitor_service { 'etherpad http':
+ description => 'Etherpad HTTP',
+ check_command => 'check_http_on_port!9000';
+ }
}
class misc::etherpad_lite {
- include passwords::etherpad_lite
+ include passwords::etherpad_lite
- $etherpad_db_user = $passwords::etherpad_lite::etherpad_db_user
- $etherpad_db_host = $passwords::etherpad_lite::etherpad_db_host
- $etherpad_db_name = $passwords::etherpad_lite::etherpad_db_name
- $etherpad_db_pass = $passwords::etherpad_lite::etherpad_db_pass
+ $etherpad_db_user = $passwords::etherpad_lite::etherpad_db_user
+ $etherpad_db_host = $passwords::etherpad_lite::etherpad_db_host
+ $etherpad_db_name = $passwords::etherpad_lite::etherpad_db_name
+ $etherpad_db_pass = $passwords::etherpad_lite::etherpad_db_pass
- if $realm == 'labs' {
- $etherpad_host = $fqdn
- $etherpad_ssl_cert = '/etc/ssl/certs/ssl-cert-snakeoil.pem'
- $etherpad_ssl_key = '/etc/ssl/private/ssl-cert-snakeoil.key'
- } else {
- $etherpad_host = 'etherpad.wikimedia.org'
- $etherpad_serveraliases = 'epl.wikimedia.org'
- $etherpad_ssl_cert = '/etc/ssl/certs/star.wikimedia.org.pem'
- $etherpad_ssl_key = '/etc/ssl/private/star.wikimedia.org.key'
- }
+ if $::realm == 'labs' {
+ $etherpad_host = $fqdn
+ $etherpad_ssl_cert = '/etc/ssl/certs/ssl-cert-snakeoil.pem'
+ $etherpad_ssl_key = '/etc/ssl/private/ssl-cert-snakeoil.key'
+ } else {
+ $etherpad_host = 'etherpad.wikimedia.org'
+ $etherpad_serveraliases = 'epl.wikimedia.org'
+ $etherpad_ssl_cert = '/etc/ssl/certs/star.wikimedia.org.pem'
+ $etherpad_ssl_key = '/etc/ssl/private/star.wikimedia.org.key'
+ }
- $etherpad_ip = '127.0.0.1'
- $etherpad_port = '9001'
+ $etherpad_ip = '127.0.0.1'
+ $etherpad_port = '9001'
- system::role { "misc::etherpad_lite": description => "Etherpad-lite
server" }
+ system::role { 'misc::etherpad_lite': description => 'Etherpad-lite
server' }
- file {
- "/etc/apache2/sites-available/etherpad.wikimedia.org":
- mode => 0444,
- owner => root,
- group => root,
- notify => Service["apache2"],
- content =>
template('apache/sites/etherpad_lite.wikimedia.org.erb'),
- ensure => present;
- }
+ file {
+ '/etc/apache2/sites-available/etherpad.wikimedia.org':
+ ensure => present,
+ mode => '0444',
+ owner => 'root',
+ group => 'root',
+ notify => Service['apache2'],
+ content =>
template('apache/sites/etherpad_lite.wikimedia.org.erb');
+ }
- apache_site { controller: name => "etherpad.wikimedia.org" }
- # FIX ME - move this to a common role to avoid duplicate defs
- # apache_module { rewrite: name => "rewrite" }
- apache_module { proxy: name => "proxy" }
- apache_module { proxy_http: name => "proxy_http" }
- # apache_module { ssl: name => "ssl" }
+ apache_site { 'controller': name => 'etherpad.wikimedia.org' }
+ # FIX ME - move this to a common role to avoid duplicate defs
+ # apache_module { rewrite: name => 'rewrite' }
+ apache_module { 'proxy': name => 'proxy' }
+ apache_module { 'proxy_http': name => 'proxy_http' }
+ # apache_module { ssl: name => 'ssl' }
- package { etherpad-lite:
- ensure => latest;
- }
- service { etherpad-lite:
- require => Package["etherpad-lite"],
- subscribe => File['/etc/etherpad-lite/settings.json'],
- enable => true,
- ensure => running;
- }
+ package { 'etherpad-lite':
+ ensure => latest;
+ }
+ service { 'etherpad-lite':
+ ensure => running,
+ require => Package['etherpad-lite'],
+ subscribe => File['/etc/etherpad-lite/settings.json'],
+ enable => true;
+ }
- # Icinga process monitoring, RT #5790
- monitor_service { 'etherpad-lite-proc':
- description => 'etherpad_lite_process_running',
- check_command => 'nrpe_check_etherpad_lite';
- }
+ # Icinga process monitoring, RT #5790
+ monitor_service { 'etherpad-lite-proc':
+ description => 'etherpad_lite_process_running',
+ check_command => 'nrpe_check_etherpad_lite';
+ }
- #FIXME
- #service { apache2:
- # enable => true,
- # ensure => running;
- #}
+ #FIXME
+ #service { apache2:
+ # enable => true,
+ # ensure => running;
+ #}
- file {
- '/etc/etherpad-lite/settings.json':
- require => Package[etherpad-lite],
- owner => 'root',
- group => 'root',
- mode => 0444,
- content => template('etherpad_lite/settings.json.erb');
- }
+ file {
+ '/etc/etherpad-lite/settings.json':
+ require => Package[etherpad-lite],
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ content => template('etherpad_lite/settings.json.erb');
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/96354
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac87c642d4b421a51edabdbc2ae6981cebb0cb28
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
