Faidon Liambotis has submitted this change and it was merged.
Change subject: Indent & format role/parsoid.pp
......................................................................
Indent & format role/parsoid.pp
No code change, indentation & formatting changes only.
* retab to 4 spaces
* align arrows
* quote file modes
* 'ensure' as first parameter
* double quotes to single quotes
* one file statement per file
* explode arrays to have one element per line
* trailing comma for next array element
* join statement (file, define, service) and defined name on the same
line.
Change-Id: Ic1a3bcc2d6b27eef23f2cbd548311855269eeec2
---
M manifests/role/parsoid.pp
1 file changed, 57 insertions(+), 42 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/parsoid.pp b/manifests/role/parsoid.pp
index 892900d..9d44f18 100644
--- a/manifests/role/parsoid.pp
+++ b/manifests/role/parsoid.pp
@@ -1,51 +1,66 @@
+# vim: set ts=4 et sw=4:
-@monitor_group { "parsoid_eqiad": description => "eqiad parsoid servers" }
-@monitor_group { "parsoid_pmtpa": description => "pmtpa parsoid servers" }
+@monitor_group { 'parsoid_eqiad': description => 'eqiad parsoid servers' }
+@monitor_group { 'parsoid_pmtpa': description => 'pmtpa parsoid servers' }
class role::parsoid::production {
- system::role { "role::parsoid::production": description => "Parsoid
server" }
- deployment::target { "parsoid": }
+ system::role { 'role::parsoid::production':
+ description => 'Parsoid server'
+ }
- package { [ "nodejs", "npm", "build-essential" ]:
- ensure => latest
- }
+ deployment::target { 'parsoid': }
- file {
- "/var/lib/parsoid":
- ensure => directory,
- owner => parsoid,
- group => wikidev,
- mode => 2775;
- "/var/lib/parsoid/Parsoid":
- ensure => link,
- target => "/srv/deployment/parsoid/Parsoid";
- "/etc/init.d/parsoid":
- source => "puppet:///files/misc/parsoid.init",
- owner => root,
- group => root,
- mode => 0555;
- "/usr/bin/parsoid":
- source => "puppet:///files/misc/parsoid",
- owner => root,
- group => root,
- mode => 0555;
- }
+ package { [
+ 'nodejs',
+ 'npm',
+ 'build-essential',
+ ]: ensure => latest,
+ }
- generic::systemuser {
- parsoid:
- name => "parsoid",
- default_group => "parsoid",
- home => "/var/lib/parsoid";
- }
+ file { '/var/lib/parsoid':
+ ensure => directory,
+ owner => parsoid,
+ group => wikidev,
+ mode => '2775',
+ }
- service {
- "parsoid":
- hasstatus => true,
- hasrestart => true,
- enable => true,
- ensure => running,
- require => [File["/etc/init.d/parsoid"]];
- }
+ file { '/var/lib/parsoid/Parsoid':
+ ensure => link,
+ target => '/srv/deployment/parsoid/Parsoid',
+ }
- monitor_service { "parsoid": description => "Parsoid", check_command =>
"check_http_on_port!8000" }
+ file { '/etc/init.d/parsoid':
+ ensure => present,
+ owner => root,
+ group => root,
+ mode => '0555',
+ source => 'puppet:///files/misc/parsoid.init',
+ }
+
+ file { '/usr/bin/parsoid':
+ ensure => present,
+ owner => root,
+ group => root,
+ mode => '0555',
+ source => 'puppet:///files/misc/parsoid',
+ }
+
+ generic::systemuser { 'parsoid':
+ name => 'parsoid',
+ default_group => 'parsoid',
+ home => '/var/lib/parsoid',
+ }
+
+ service { 'parsoid':
+ ensure => running,
+ hasstatus => true,
+ hasrestart => true,
+ enable => true,
+ require => File['/etc/init.d/parsoid'],
+ }
+
+ monitor_service { 'parsoid':
+ description => 'Parsoid',
+ check_command => 'check_http_on_port!8000',
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/96271
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic1a3bcc2d6b27eef23f2cbd548311855269eeec2
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: GWicke <gwi...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
