Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/186597
Change subject: scap: Move 'common_scripts' into scripts class
......................................................................
scap: Move 'common_scripts' into scripts class
A mechanical move
Bug: T87221
Change-Id: Icba39e8e70680b7bbb2b47646f88f54ea9c52781
---
M manifests/misc/deployment.pp
M manifests/role/nova.pp
M manifests/site.pp
M modules/beta/manifests/autoupdater.pp
R modules/scap/files/clear-profile
R modules/scap/files/deploy2graphite
R modules/scap/files/dologmsg
R modules/scap/files/foreachwiki
R modules/scap/files/foreachwikiindblist
R modules/scap/files/manpages/README.manpages
R modules/scap/files/manpages/asciidoc/_annotated.txt
R modules/scap/files/manpages/asciidoc/clear-profile.txt
R modules/scap/files/manpages/asciidoc/dologmsg.txt
R modules/scap/files/manpages/asciidoc/foreachwiki.txt
R modules/scap/files/manpages/asciidoc/set-group-write.txt
R modules/scap/files/manpages/man/clear-profile.8
R modules/scap/files/manpages/man/dologmsg.1
R modules/scap/files/manpages/man/foreachwiki.1
R modules/scap/files/manpages/man/set-group-write.1
R modules/scap/files/manpages/man/set-group-write2.1
R modules/scap/files/mwgrep
R modules/scap/files/mwscript
R modules/scap/files/mwscriptwikiset
R modules/scap/files/notifyNewProjects
R modules/scap/files/purge-varnish
R modules/scap/files/refreshWikiversionsCDB
R modules/scap/files/reset-mysql-slave
R modules/scap/files/set-group-write
R modules/scap/files/set-group-write2
R modules/scap/files/sql
R modules/scap/files/sqldump
R modules/scap/files/sudo-withagent
R modules/scap/files/udprec
R modules/scap/files/updateinterwikicache
A modules/scap/manifests/scripts.pp
35 files changed, 134 insertions(+), 128 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/97/186597/1
diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index b9266a2..f8aeebe 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -8,133 +8,9 @@
include dsh
}
-class misc::deployment::common_scripts {
- require passwordscripts
-
- package { ['libwww-perl', 'libnet-dns-perl']:
- ensure => present;
- }
- package { 'php5-parsekit':
- ensure => absent;
- }
-
- file {
- '/usr/local/bin/clear-profile':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///files/misc/scripts/clear-profile';
- '/usr/local/bin/configchange':
- ensure => absent;
- '/usr/local/bin/dologmsg':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///files/misc/scripts/dologmsg';
- '/usr/local/bin/mwgrep':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///files/misc/scripts/mwgrep';
- '/usr/local/bin/deploy2graphite':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///files/misc/scripts/deploy2graphite';
- '/usr/local/bin/foreachwiki':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///files/misc/scripts/foreachwiki';
- '/usr/local/bin/foreachwikiindblist':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///files/misc/scripts/foreachwikiindblist';
- '/usr/local/bin/lint':
- ensure => 'absent';
- '/usr/local/bin/lint.php':
- ensure => 'absent';
- '/usr/local/bin/mwscript':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///files/misc/scripts/mwscript';
- '/usr/local/bin/mwscriptwikiset':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///files/misc/scripts/mwscriptwikiset';
- '/usr/local/bin/notifyNewProjects':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///files/misc/scripts/notifyNewProjects';
- '/usr/local/bin/purge-varnish':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///files/misc/scripts/purge-varnish';
- '/usr/local/bin/refreshWikiversionsCDB':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///files/misc/scripts/refreshWikiversionsCDB';
- '/usr/local/bin/reset-mysql-slave':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///files/misc/scripts/reset-mysql-slave';
- '/usr/local/bin/set-group-write':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///files/misc/scripts/set-group-write';
- '/usr/local/bin/sql':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///files/misc/scripts/sql';
- '/usr/local/bin/sqldump':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///files/misc/scripts/sqldump';
- '/usr/local/bin/udprec':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///files/misc/scripts/udprec';
- '/usr/local/sbin/set-group-write2':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///files/misc/scripts/set-group-write2';
- '/usr/local/bin/updateinterwikicache':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///files/misc/scripts/updateinterwikicache';
- # Manpages
- # Need to be generated manually using make in files/misc/scripts
- '/usr/local/share/man/man1':
- ensure => 'directory',
- recurse => true,
- owner => 'root',
- group => 'root',
- mode => '0444',
- source => 'puppet:///files/misc/scripts/man';
- '/usr/local/bin/sudo-withagent':
- owner => 'root',
- group => 'root',
- mode => '0555',
- source => 'puppet:///files/misc/scripts/sudo-withagent';
- }
-}
-
# Scripts for the old rsync-based deployment system
class misc::deployment::scap_scripts {
- include misc::deployment::common_scripts
+ include scap::scripts
include misc::deployment::vars
}
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index f8f6b7f..83ab00d 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -255,7 +255,7 @@
include ::nutcracker::monitoring
include ::mediawiki::packages::php5
- include ::misc::deployment::common_scripts
+ include ::scap::scripts
class { '::nutcracker':
mbuf_size => '64k',
diff --git a/manifests/site.pp b/manifests/site.pp
index eca4d79..c44d2f6 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2319,7 +2319,7 @@
include role::db::maintenance
include role::peopleweb
include misc::monitoring::jobqueue
- include misc::deployment::common_scripts
+ include scap::scripts
include role::noc
include role::mediawiki::searchmonitor
diff --git a/modules/beta/manifests/autoupdater.pp
b/modules/beta/manifests/autoupdater.pp
index 3205801..2e977eb 100644
--- a/modules/beta/manifests/autoupdater.pp
+++ b/modules/beta/manifests/autoupdater.pp
@@ -5,7 +5,7 @@
# branches.
class beta::autoupdater {
include ::beta::config
- require misc::deployment::common_scripts
+ require scap::scripts
$stage_dir = $::beta::config::scap_stage_dir
diff --git a/files/misc/scripts/clear-profile b/modules/scap/files/clear-profile
similarity index 100%
rename from files/misc/scripts/clear-profile
rename to modules/scap/files/clear-profile
diff --git a/files/misc/scripts/deploy2graphite
b/modules/scap/files/deploy2graphite
similarity index 100%
rename from files/misc/scripts/deploy2graphite
rename to modules/scap/files/deploy2graphite
diff --git a/files/misc/scripts/dologmsg b/modules/scap/files/dologmsg
similarity index 100%
rename from files/misc/scripts/dologmsg
rename to modules/scap/files/dologmsg
diff --git a/files/misc/scripts/foreachwiki b/modules/scap/files/foreachwiki
similarity index 100%
rename from files/misc/scripts/foreachwiki
rename to modules/scap/files/foreachwiki
diff --git a/files/misc/scripts/foreachwikiindblist
b/modules/scap/files/foreachwikiindblist
similarity index 100%
rename from files/misc/scripts/foreachwikiindblist
rename to modules/scap/files/foreachwikiindblist
diff --git a/files/misc/scripts/README.manpages
b/modules/scap/files/manpages/README.manpages
similarity index 100%
rename from files/misc/scripts/README.manpages
rename to modules/scap/files/manpages/README.manpages
diff --git a/files/misc/scripts/asciidoc/_annotated.txt
b/modules/scap/files/manpages/asciidoc/_annotated.txt
similarity index 100%
rename from files/misc/scripts/asciidoc/_annotated.txt
rename to modules/scap/files/manpages/asciidoc/_annotated.txt
diff --git a/files/misc/scripts/asciidoc/clear-profile.txt
b/modules/scap/files/manpages/asciidoc/clear-profile.txt
similarity index 100%
rename from files/misc/scripts/asciidoc/clear-profile.txt
rename to modules/scap/files/manpages/asciidoc/clear-profile.txt
diff --git a/files/misc/scripts/asciidoc/dologmsg.txt
b/modules/scap/files/manpages/asciidoc/dologmsg.txt
similarity index 100%
rename from files/misc/scripts/asciidoc/dologmsg.txt
rename to modules/scap/files/manpages/asciidoc/dologmsg.txt
diff --git a/files/misc/scripts/asciidoc/foreachwiki.txt
b/modules/scap/files/manpages/asciidoc/foreachwiki.txt
similarity index 100%
rename from files/misc/scripts/asciidoc/foreachwiki.txt
rename to modules/scap/files/manpages/asciidoc/foreachwiki.txt
diff --git a/files/misc/scripts/asciidoc/set-group-write.txt
b/modules/scap/files/manpages/asciidoc/set-group-write.txt
similarity index 100%
rename from files/misc/scripts/asciidoc/set-group-write.txt
rename to modules/scap/files/manpages/asciidoc/set-group-write.txt
diff --git a/files/misc/scripts/man/clear-profile.8
b/modules/scap/files/manpages/man/clear-profile.8
similarity index 100%
rename from files/misc/scripts/man/clear-profile.8
rename to modules/scap/files/manpages/man/clear-profile.8
diff --git a/files/misc/scripts/man/dologmsg.1
b/modules/scap/files/manpages/man/dologmsg.1
similarity index 100%
rename from files/misc/scripts/man/dologmsg.1
rename to modules/scap/files/manpages/man/dologmsg.1
diff --git a/files/misc/scripts/man/foreachwiki.1
b/modules/scap/files/manpages/man/foreachwiki.1
similarity index 100%
rename from files/misc/scripts/man/foreachwiki.1
rename to modules/scap/files/manpages/man/foreachwiki.1
diff --git a/files/misc/scripts/man/set-group-write.1
b/modules/scap/files/manpages/man/set-group-write.1
similarity index 100%
rename from files/misc/scripts/man/set-group-write.1
rename to modules/scap/files/manpages/man/set-group-write.1
diff --git a/files/misc/scripts/man/set-group-write2.1
b/modules/scap/files/manpages/man/set-group-write2.1
similarity index 100%
rename from files/misc/scripts/man/set-group-write2.1
rename to modules/scap/files/manpages/man/set-group-write2.1
diff --git a/files/misc/scripts/mwgrep b/modules/scap/files/mwgrep
similarity index 100%
rename from files/misc/scripts/mwgrep
rename to modules/scap/files/mwgrep
diff --git a/files/misc/scripts/mwscript b/modules/scap/files/mwscript
similarity index 100%
rename from files/misc/scripts/mwscript
rename to modules/scap/files/mwscript
diff --git a/files/misc/scripts/mwscriptwikiset
b/modules/scap/files/mwscriptwikiset
similarity index 100%
rename from files/misc/scripts/mwscriptwikiset
rename to modules/scap/files/mwscriptwikiset
diff --git a/files/misc/scripts/notifyNewProjects
b/modules/scap/files/notifyNewProjects
similarity index 100%
rename from files/misc/scripts/notifyNewProjects
rename to modules/scap/files/notifyNewProjects
diff --git a/files/misc/scripts/purge-varnish b/modules/scap/files/purge-varnish
similarity index 100%
rename from files/misc/scripts/purge-varnish
rename to modules/scap/files/purge-varnish
diff --git a/files/misc/scripts/refreshWikiversionsCDB
b/modules/scap/files/refreshWikiversionsCDB
similarity index 100%
rename from files/misc/scripts/refreshWikiversionsCDB
rename to modules/scap/files/refreshWikiversionsCDB
diff --git a/files/misc/scripts/reset-mysql-slave
b/modules/scap/files/reset-mysql-slave
similarity index 100%
rename from files/misc/scripts/reset-mysql-slave
rename to modules/scap/files/reset-mysql-slave
diff --git a/files/misc/scripts/set-group-write
b/modules/scap/files/set-group-write
similarity index 100%
rename from files/misc/scripts/set-group-write
rename to modules/scap/files/set-group-write
diff --git a/files/misc/scripts/set-group-write2
b/modules/scap/files/set-group-write2
similarity index 100%
rename from files/misc/scripts/set-group-write2
rename to modules/scap/files/set-group-write2
diff --git a/files/misc/scripts/sql b/modules/scap/files/sql
similarity index 100%
rename from files/misc/scripts/sql
rename to modules/scap/files/sql
diff --git a/files/misc/scripts/sqldump b/modules/scap/files/sqldump
similarity index 100%
rename from files/misc/scripts/sqldump
rename to modules/scap/files/sqldump
diff --git a/files/misc/scripts/sudo-withagent
b/modules/scap/files/sudo-withagent
similarity index 100%
rename from files/misc/scripts/sudo-withagent
rename to modules/scap/files/sudo-withagent
diff --git a/files/misc/scripts/udprec b/modules/scap/files/udprec
similarity index 100%
rename from files/misc/scripts/udprec
rename to modules/scap/files/udprec
Binary files differ
diff --git a/files/misc/scripts/updateinterwikicache
b/modules/scap/files/updateinterwikicache
similarity index 100%
rename from files/misc/scripts/updateinterwikicache
rename to modules/scap/files/updateinterwikicache
diff --git a/modules/scap/manifests/scripts.pp
b/modules/scap/manifests/scripts.pp
new file mode 100644
index 0000000..2fee20b
--- /dev/null
+++ b/modules/scap/manifests/scripts.pp
@@ -0,0 +1,130 @@
+# = class: scap::scripts
+#
+# Sets up commonly used scripts useful on scap masters
+# FIXME: Why isn't this in a package?
+# FIXME: Why are these in a combination of languages?
+# FIXME: Why are these named-like-this and namedLikeThis
+# FIXME: Why man pages for some but not all?
+class scap::scripts {
+ require passwordscripts
+
+ package { ['libwww-perl', 'libnet-dns-perl']:
+ ensure => present;
+ }
+ package { 'php5-parsekit':
+ ensure => absent;
+ }
+
+ file {
+ '/usr/local/bin/clear-profile':
+ owner => 'root',
+ group => 'root',
+ mode => '0555',
+ source => 'puppet:///modules/scap/clear-profile';
+ '/usr/local/bin/configchange':
+ ensure => absent;
+ '/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',
+ source => 'puppet:///modules/scap/foreachwikiindblist';
+ '/usr/local/bin/lint':
+ ensure => 'absent';
+ '/usr/local/bin/lint.php':
+ ensure => 'absent';
+ '/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';
+ # 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';
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/186597
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icba39e8e70680b7bbb2b47646f88f54ea9c52781
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
