Ori.livneh has submitted this change and it was merged.
Change subject: scap: lint
......................................................................
scap: lint
Change-Id: I841c880b750921e2dada89a610956ede51cf5b37
---
M modules/scap/manifests/l10nupdate.pp
M modules/scap/manifests/master.pp
M modules/scap/manifests/scripts.pp
3 files changed, 178 insertions(+), 154 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/modules/scap/manifests/l10nupdate.pp
b/modules/scap/manifests/l10nupdate.pp
index b675b8c..52763b8 100644
--- a/modules/scap/manifests/l10nupdate.pp
+++ b/modules/scap/manifests/l10nupdate.pp
@@ -8,32 +8,34 @@
ensure => present,
command => '/usr/local/bin/l10nupdate-1 --verbose >>
/var/log/l10nupdatelog/l10nupdate.log 2>&1',
user => 'l10nupdate',
- hour => 2,
- minute => 0;
+ hour => '2',
+ minute => '0',
}
- file {
- '/usr/local/bin/l10nupdate':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/scap/l10nupdate';
- '/usr/local/bin/l10nupdate-1':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/scap/l10nupdate-1';
+ file { '/usr/local/bin/l10nupdate':
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => 'puppet:///modules/scap/l10nupdate',
+ }
+ file { '/usr/local/bin/l10nupdate-1':
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => 'puppet:///modules/scap/l10nupdate-1',
+ }
# add ssh keypair for l10nupdate user from fenari for RT-5187
- '/home/l10nupdate/.ssh/id_rsa':
- owner => 'l10nupdate',
- group => 'l10nupdate',
- mode => '0400',
- source => 'puppet:///private/ssh/tin/l10nupdate/id_rsa';
- '/home/l10nupdate/.ssh/id_rsa.pub':
- owner => 'l10nupdate',
- group => 'l10nupdate',
- mode => '0444',
- source => 'puppet:///private/ssh/tin/l10nupdate/id_rsa.pub';
+ file { '/home/l10nupdate/.ssh/id_rsa':
+ owner => 'l10nupdate',
+ group => 'l10nupdate',
+ mode => '0400',
+ source => 'puppet:///private/ssh/tin/l10nupdate/id_rsa',
+ }
+ file { '/home/l10nupdate/.ssh/id_rsa.pub':
+ owner => 'l10nupdate',
+ group => 'l10nupdate',
+ mode => '0444',
+ source => 'puppet:///private/ssh/tin/l10nupdate/id_rsa.pub',
}
# Make sure the log directory exists and has adequate permissions.
@@ -41,22 +43,25 @@
# previously so it'll be an existing file on some systems.
# Also create the dir for the SVN checkouts, and set up log rotation
file { '/var/log/l10nupdatelog':
- ensure => directory,
- owner => 'l10nupdate',
- group => $deployment_group,
- mode => '0664';
- '/var/lib/l10nupdate':
- ensure => directory,
- owner => 'l10nupdate',
- group => $deployment_group,
- mode => '0755';
- '/var/lib/l10nupdate/caches':
- ensure => directory,
- owner => $::mediawiki::users::web,
- group => $::mediawiki::users::web,
- mode => '0755';
- '/etc/logrotate.d/l10nupdate':
- source => 'puppet:///modules/scap/l10nupdate.logrotate',
- mode => '0444';
+ ensure => directory,
+ owner => 'l10nupdate',
+ group => $deployment_group,
+ mode => '0664',
+ }
+ file { '/var/lib/l10nupdate':
+ ensure => directory,
+ owner => 'l10nupdate',
+ group => $deployment_group,
+ mode => '0755',
+ }
+ file { '/var/lib/l10nupdate/caches':
+ ensure => directory,
+ owner => $::mediawiki::users::web,
+ group => $::mediawiki::users::web,
+ mode => '0755',
+ }
+ file { '/etc/logrotate.d/l10nupdate':
+ source => 'puppet:///modules/scap/l10nupdate.logrotate',
+ mode => '0444',
}
}
diff --git a/modules/scap/manifests/master.pp b/modules/scap/manifests/master.pp
index 5c4b158..51720f1 100644
--- a/modules/scap/manifests/master.pp
+++ b/modules/scap/manifests/master.pp
@@ -2,12 +2,12 @@
#
# Sets up a scap master (currently tin).
class scap::master(
- $common_path = '/srv/mediawiki',
+ $common_path = '/srv/mediawiki',
$common_source_path = '/srv/mediawiki-staging',
- $rsync_host = 'tin.eqiad.wmnet',
- $statsd_host = 'statsd.eqiad.wmnet',
- $statsd_port = 8125,
- $deployment_group = 'wikidev',
+ $rsync_host = 'tin.eqiad.wmnet',
+ $statsd_host = 'statsd.eqiad.wmnet',
+ $statsd_port = 8125,
+ $deployment_group = 'wikidev',
) {
include scap::scripts
include rsync::server
diff --git a/modules/scap/manifests/scripts.pp
b/modules/scap/manifests/scripts.pp
index fb6553c..6846f20 100644
--- a/modules/scap/manifests/scripts.pp
+++ b/modules/scap/manifests/scripts.pp
@@ -10,118 +10,137 @@
require mediawiki::users
package { ['libwww-perl', 'libnet-dns-perl']:
- ensure => present;
+ ensure => 'present',
}
- file {
- '/usr/local/bin/clear-profile':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/scap/clear-profile';
- '/usr/local/bin/dologmsg':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/scap/dologmsg';
- '/usr/local/bin/mwgrep':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/scap/mwgrep';
- '/usr/local/bin/deploy2graphite':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/scap/deploy2graphite';
- '/usr/local/bin/foreachwiki':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/scap/foreachwiki';
- '/usr/local/bin/foreachwikiindblist':
- owner => 'root',
- group => 'root',
- mode => '0555',
- content => template('scap/foreachwikiindblist.erb');
- '/usr/local/bin/mwscript':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/scap/mwscript';
- '/usr/local/bin/mwscriptwikiset':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/scap/mwscriptwikiset';
- '/usr/local/bin/notifyNewProjects':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/scap/notifyNewProjects';
- '/usr/local/bin/purge-varnish':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/scap/purge-varnish';
- '/usr/local/bin/refreshWikiversionsCDB':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/scap/refreshWikiversionsCDB';
- '/usr/local/bin/reset-mysql-slave':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/scap/reset-mysql-slave';
- '/usr/local/bin/set-group-write':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/scap/set-group-write';
- '/usr/local/bin/sql':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/scap/sql';
- '/usr/local/bin/sqldump':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/scap/sqldump';
- '/usr/local/bin/udprec':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/scap/udprec';
- '/usr/local/sbin/set-group-write2':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/scap/set-group-write2';
- '/usr/local/bin/updateinterwikicache':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/scap/updateinterwikicache';
+ file { '/usr/local/bin/clear-profile':
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => 'puppet:///modules/scap/clear-profile',
+ }
+ file { '/usr/local/bin/dologmsg':
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => 'puppet:///modules/scap/dologmsg',
+ }
+ file { '/usr/local/bin/mwgrep':
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => 'puppet:///modules/scap/mwgrep',
+ }
+ file { '/usr/local/bin/deploy2graphite':
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => 'puppet:///modules/scap/deploy2graphite',
+ }
+ file { '/usr/local/bin/foreachwiki':
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => 'puppet:///modules/scap/foreachwiki',
+ }
+ file { '/usr/local/bin/foreachwikiindblist':
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ content => template('scap/foreachwikiindblist.erb'),
+ }
+ file { '/usr/local/bin/mwscript':
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ content => template('scap/mwscript.erb'),
+ }
+ file { '/usr/local/bin/mwscriptwikiset':
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => 'puppet:///modules/scap/mwscriptwikiset',
+ }
+ file { '/usr/local/bin/notifyNewProjects':
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => 'puppet:///modules/scap/notifyNewProjects',
+ }
+ file { '/usr/local/bin/purge-varnish':
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => 'puppet:///modules/scap/purge-varnish',
+ }
+ file { '/usr/local/bin/refreshWikiversionsCDB':
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => 'puppet:///modules/scap/refreshWikiversionsCDB',
+ }
+ file { '/usr/local/bin/reset-mysql-slave':
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => 'puppet:///modules/scap/reset-mysql-slave',
+ }
+ file { '/usr/local/bin/set-group-write':
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => 'puppet:///modules/scap/set-group-write',
+ }
+ file { '/usr/local/bin/sql':
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => 'puppet:///modules/scap/sql',
+ }
+ file { '/usr/local/bin/sqldump':
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => 'puppet:///modules/scap/sqldump',
+ }
+ file { '/usr/local/bin/udprec':
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => 'puppet:///modules/scap/udprec',
+ }
+ file { '/usr/local/sbin/set-group-write2':
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => 'puppet:///modules/scap/set-group-write2',
+ }
+ file { '/usr/local/bin/updateinterwikicache':
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => 'puppet:///modules/scap/updateinterwikicache',
+ }
# Manpages
# Need to be generated manually using make in
modules/scap/files/manpages
- '/usr/local/share/man/man1':
- ensure => 'directory',
- recurse => true,
- owner => 'root',
- group => 'root',
- mode => '0444',
- source => 'puppet:///modules/scap/manpages/man';
- '/usr/local/bin/sudo-withagent':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///modules/scap/sudo-withagent';
- '/usr/local/lib/mw-deployment-vars.sh':
- owner => 'root',
- group => 'root',
- mode => '0444',
- content => template('scap/mw-deployment-vars.erb');
+ file { '/usr/local/share/man/man1':
+ ensure => 'directory',
+ recurse => true,
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ source => 'puppet:///modules/scap/manpages/man',
+ }
+ file { '/usr/local/bin/sudo-withagent':
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => 'puppet:///modules/scap/sudo-withagent',
+ }
+ file { '/usr/local/lib/mw-deployment-vars.sh':
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ content => template('scap/mw-deployment-vars.erb'),
}
}
--
To view, visit https://gerrit.wikimedia.org/r/195680
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I841c880b750921e2dada89a610956ede51cf5b37
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
