Ori.livneh has submitted this change and it was merged.
Change subject: fold deployment::vars into mediawiki::scap
......................................................................
fold deployment::vars into mediawiki::scap
* Rename mw-deployment-vars.sh to /etc/profile.d/mediawiki.sh
* Get rid of add-scap-to-path.sh; taken care of by mediawiki.sh above.
* Get rid of unused args.
Change-Id: Ibaa28d8cb93c440f909e075e767f47a30076b687
---
M files/misc/l10nupdate/l10nupdate-1
M files/misc/l10nupdate/sync-l10nupdate-1
M files/misc/scripts/deploy2graphite
M files/misc/scripts/foreachwiki
M files/misc/scripts/foreachwikiindblist
M files/misc/scripts/mwscript
M files/misc/scripts/mwscriptwikiset
M files/misc/scripts/mwscriptwikiset-quiet
M files/misc/scripts/refreshWikiversionsCDB
M files/misc/scripts/set-group-write2
M files/misc/scripts/sql
M files/misc/scripts/sqldump
M files/misc/scripts/update-special-pages
M files/misc/scripts/updateinterwikicache
M files/misc/scripts/wikimedia-periodic-update.sh
M modules/admin/files/home/ori/.hosts/tin
M modules/mediawiki/manifests/scap.pp
A modules/mediawiki/templates/mediawiki.sh.erb
18 files changed, 31 insertions(+), 21 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/misc/l10nupdate/l10nupdate-1
b/files/misc/l10nupdate/l10nupdate-1
index b749a62..e201d1d 100755
--- a/files/misc/l10nupdate/l10nupdate-1
+++ b/files/misc/l10nupdate/l10nupdate-1
@@ -1,6 +1,6 @@
#!/bin/bash
# This script belongs in /usr/local/bin/.
-. /usr/local/lib/mw-deployment-vars.sh
+. /etc/profile.d/mediawiki.sh
. $MEDIAWIKI_STAGING_DIR/multiversion/MWRealm.sh
BINDIR=/usr/local/bin
diff --git a/files/misc/l10nupdate/sync-l10nupdate-1
b/files/misc/l10nupdate/sync-l10nupdate-1
index ba2c1db..ad0e5ea 100755
--- a/files/misc/l10nupdate/sync-l10nupdate-1
+++ b/files/misc/l10nupdate/sync-l10nupdate-1
@@ -1,8 +1,9 @@
#!/bin/bash
# This script belongs in /usr/local/bin/.
-. /usr/local/lib/mw-deployment-vars.sh
+. /etc/profile.d/mediawiki.sh
MWVER="$1"
+MW_RSYNC_HOST="tin.eqiad.wmnet"
if [ -z "$MWVER" ]; then
echo "FAILED: MediaWiki version not provided"
diff --git a/files/misc/scripts/deploy2graphite
b/files/misc/scripts/deploy2graphite
index 4dead4a..7f6b259 100755
--- a/files/misc/scripts/deploy2graphite
+++ b/files/misc/scripts/deploy2graphite
@@ -1,6 +1,6 @@
#! /bin/bash
-. /usr/local/lib/mw-deployment-vars.sh
+. /etc/profile.d/mediawiki.sh
usage() {
echo "Usage: $0 deploy_type [deploy_duration_seconds]"
diff --git a/files/misc/scripts/foreachwiki b/files/misc/scripts/foreachwiki
index 1506797..3d7329c 100755
--- a/files/misc/scripts/foreachwiki
+++ b/files/misc/scripts/foreachwiki
@@ -1,6 +1,6 @@
#!/bin/bash
-. /usr/local/lib/mw-deployment-vars.sh
+. /etc/profile.d/mediawiki.sh
# Let us vary mediawiki-config files by realm
. $MEDIAWIKI_STAGING_DIR/multiversion/MWRealm.sh
diff --git a/files/misc/scripts/foreachwikiindblist
b/files/misc/scripts/foreachwikiindblist
index e6a915b..aa3073f 100755
--- a/files/misc/scripts/foreachwikiindblist
+++ b/files/misc/scripts/foreachwikiindblist
@@ -1,6 +1,6 @@
#!/bin/bash
-. /usr/local/lib/mw-deployment-vars.sh
+. /etc/profile.d/mediawiki.sh
DBLIST=`<$1`
CMD=$2
shift
diff --git a/files/misc/scripts/mwscript b/files/misc/scripts/mwscript
index c07ed5d..95128c9 100755
--- a/files/misc/scripts/mwscript
+++ b/files/misc/scripts/mwscript
@@ -1,7 +1,7 @@
#!/bin/bash
# Shell wrapper for the home version of multiversion/MWScript.php.
# This script belongs in /usr/local/bin/ and should be in PATH.
-. /usr/local/lib/mw-deployment-vars.sh
+. /etc/profile.d/mediawiki.sh
# Use the source version of the script if the source directory is present.
# This only matters if the source dir is shared or when run on the deployment
server.
diff --git a/files/misc/scripts/mwscriptwikiset
b/files/misc/scripts/mwscriptwikiset
index 421bf07..1b5cfc6 100755
--- a/files/misc/scripts/mwscriptwikiset
+++ b/files/misc/scripts/mwscriptwikiset
@@ -5,7 +5,7 @@
# and runs the maintenance script on each of the wikis in the list.
# Note that this script prints some status info.
-. /usr/local/lib/mw-deployment-vars.sh
+. /etc/profile.d/mediawiki.sh
SCRIPTFILE=$1
LISTFILE=$2
diff --git a/files/misc/scripts/mwscriptwikiset-quiet
b/files/misc/scripts/mwscriptwikiset-quiet
index 142eb84..f0ef6d3 100755
--- a/files/misc/scripts/mwscriptwikiset-quiet
+++ b/files/misc/scripts/mwscriptwikiset-quiet
@@ -6,7 +6,7 @@
# This only prints information for wikis thas that the script gives
# a non-empty result for via STD_OUT.
-. /usr/local/lib/mw-deployment-vars.sh
+. /etc/profile.d/mediawiki.sh
SCRIPTFILE=$1
LISTFILE=$2
diff --git a/files/misc/scripts/refreshWikiversionsCDB
b/files/misc/scripts/refreshWikiversionsCDB
index 2b92f5c..5ff95c9 100755
--- a/files/misc/scripts/refreshWikiversionsCDB
+++ b/files/misc/scripts/refreshWikiversionsCDB
@@ -2,5 +2,5 @@
# Shell wrapper for the home version of multiversion/refreshWikiVersionsCDB
# This script belongs in /usr/bin/ and should be in PATH.
-. /usr/local/lib/mw-deployment-vars.sh
+. /etc/profile.d/mediawiki.sh
exec php "$MEDIAWIKI_STAGING_DIR/multiversion/refreshWikiVersionsCDB" "$@"
diff --git a/files/misc/scripts/set-group-write2
b/files/misc/scripts/set-group-write2
index 04970d9..1cdd126 100755
--- a/files/misc/scripts/set-group-write2
+++ b/files/misc/scripts/set-group-write2
@@ -1,6 +1,6 @@
#!/bin/bash
BINDIR=/usr/local/bin
-. /usr/local/lib/mw-deployment-vars.sh
+. /etc/profile.d/mediawiki.sh
mwVersionNums=$(mwversionsinuse)
for mwVerNum in ${mwVersionNums[@]}; do
diff --git a/files/misc/scripts/sql b/files/misc/scripts/sql
index 2bcea9d..8be6dbf 100755
--- a/files/misc/scripts/sql
+++ b/files/misc/scripts/sql
@@ -3,7 +3,7 @@
# This file is managed by Puppet (files/misc/scripts/sql).
# Read configuration.
-. /usr/local/lib/mw-deployment-vars.sh
+. /etc/profile.d/mediawiki.sh
MWMULTIDIR=$MEDIAWIKI_DEPLOYMENT_DIR/multiversion
# Database that the user wants to use/query.
diff --git a/files/misc/scripts/sqldump b/files/misc/scripts/sqldump
index 779be4c..5813617 100755
--- a/files/misc/scripts/sqldump
+++ b/files/misc/scripts/sqldump
@@ -1,7 +1,7 @@
#!/bin/bash
db=$1
-. /usr/local/lib/mw-deployment-vars.sh
+. /etc/profile.d/mediawiki.sh
MWMULTIDIR=$MEDIAWIKI_DEPLOYMENT_DIR/multiversion
diff --git a/files/misc/scripts/update-special-pages
b/files/misc/scripts/update-special-pages
index 173f5ed..0892bd6 100755
--- a/files/misc/scripts/update-special-pages
+++ b/files/misc/scripts/update-special-pages
@@ -1,6 +1,6 @@
#!/bin/bash
-. /usr/local/lib/mw-deployment-vars.sh
+. /etc/profile.d/mediawiki.sh
cd "$MEDIAWIKI_DEPLOYMENT_DIR/multiversion"
for db in `<"$MEDIAWIKI_DEPLOYMENT_DIR/all.dblist"`; do
diff --git a/files/misc/scripts/updateinterwikicache
b/files/misc/scripts/updateinterwikicache
index 9eea9d6..c0f43d1 100644
--- a/files/misc/scripts/updateinterwikicache
+++ b/files/misc/scripts/updateinterwikicache
@@ -1,5 +1,5 @@
#!/bin/bash
-. /usr/local/lib/mw-deployment-vars.sh
+. /etc/profile.d/mediawiki.sh
echo "Updating interwiki cache..."
file=/tmp/interwiki-$(date +%s).cdb
mwscript extensions/WikimediaMaintenance/dumpInterwiki.php -o $file
--protocolrelative
diff --git a/files/misc/scripts/wikimedia-periodic-update.sh
b/files/misc/scripts/wikimedia-periodic-update.sh
index ee46ae2..70808e2 100644
--- a/files/misc/scripts/wikimedia-periodic-update.sh
+++ b/files/misc/scripts/wikimedia-periodic-update.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-. /usr/local/lib/mw-deployment-vars.sh
+. /etc/profile.d/mediawiki.sh
for db in `<"$MEDIAWIKI_DEPLOYMENT_DIR/flaggedrevs.dblist"`;do
echo $db
diff --git a/modules/admin/files/home/ori/.hosts/tin
b/modules/admin/files/home/ori/.hosts/tin
index 1d0a5a3..f5ea53a 100755
--- a/modules/admin/files/home/ori/.hosts/tin
+++ b/modules/admin/files/home/ori/.hosts/tin
@@ -1,6 +1,6 @@
#!/bin/bash
-. /usr/local/lib/mw-deployment-vars.sh
+. /etc/profile.d/mediawiki.sh
looksgood () {
( git remote -v | grep -q mediawiki-config ) && { git merge origin/master;
return; }
diff --git a/modules/mediawiki/manifests/scap.pp
b/modules/mediawiki/manifests/scap.pp
index fa18956..3274bfb 100644
--- a/modules/mediawiki/manifests/scap.pp
+++ b/modules/mediawiki/manifests/scap.pp
@@ -1,21 +1,26 @@
class mediawiki::scap {
- include ::misc::deployment::vars
include ::mediawiki::users
+
+ $mediawiki_deployment_dir = '/srv/mediawiki'
+ $mediawiki_staging_dir = '/srv/mediawiki-staging'
package { 'scap':
ensure => latest,
provider => 'trebuchet',
}
- file { '/srv/mediawiki':
+ file { $mediawiki_deployment_dir:
ensure => directory,
owner => 'mwdeploy',
group => 'mwdeploy',
mode => '0775',
}
- file { '/etc/profile.d/add_scap_to_path.sh':
- source => 'puppet:///modules/mediawiki/profile.d_add_scap_to_path.sh',
+ file { '/etc/profile.d/mediawiki.sh':
+ content => template('mediawiki/mediawiki.sh.erb'),
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
}
# These get invoked by scap over SSH using a non-interactive, non-login
@@ -33,7 +38,7 @@
}
exec { '/usr/local/bin/sync-common':
- creates => '/srv/mediawiki/wmf-config/InitialiseSettings.php',
+ creates =>
"${mediawiki_deployment_dir}/wmf-config/InitialiseSettings.php",
timeout => 30 * 60, # 30 minutes
}
}
diff --git a/modules/mediawiki/templates/mediawiki.sh.erb
b/modules/mediawiki/templates/mediawiki.sh.erb
new file mode 100644
index 0000000..02a9606
--- /dev/null
+++ b/modules/mediawiki/templates/mediawiki.sh.erb
@@ -0,0 +1,4 @@
+# MediaWiki-related shell environment variables
+PATH="$PATH:/srv/deployment/scap/scap/bin"
+MEDIAWIKI_DEPLOYMENT_DIR="<%= @mediawiki_deployment_dir %>"
+MEDIAWIKI_STAGING_DIR="<%= @mediawiki_staging_dir %>"
--
To view, visit https://gerrit.wikimedia.org/r/160064
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibaa28d8cb93c440f909e075e767f47a30076b687
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh <[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
