Tim Starling has submitted this change and it was merged. Change subject: Revert "Set common rsync and dsh parameters in mw-deployment-vars" ......................................................................
Revert "Set common rsync and dsh parameters in mw-deployment-vars" /usr/local/bin/mwversionsinuse: 7: /usr/local/lib/mw-deployment-vars.sh: Syntax error: "(" unexpected Unable to read wikiversions.dat or it is empty. This reverts commit 7eba91549ad226a4f939ed7144ecf88f1900ffb1. Change-Id: I4e6675efe28d89e52453b0e2d494881e82cef005 --- M files/scap/mwversionsinuse M files/scap/scap-1 M files/scap/scap-1skins M files/scap/scap-2 M files/scap/sync-common-file M files/scap/sync-dblist M files/scap/sync-docroot M files/scap/sync-wikiversions M manifests/misc/deployment.pp M modules/mediawiki/manifests/sync.pp M templates/misc/mw-deployment-vars.erb 11 files changed, 26 insertions(+), 30 deletions(-) Approvals: Tim Starling: Verified; Looks good to me, approved diff --git a/files/scap/mwversionsinuse b/files/scap/mwversionsinuse index 64827cb..1f7fafc 100755 --- a/files/scap/mwversionsinuse +++ b/files/scap/mwversionsinuse @@ -1,7 +1,6 @@ #!/bin/sh # Shell wrapper for the local version of multiversion/activeMWVersions. # This script belongs in /usr/bin/ and should be in PATH. -. /usr/local/lib/mw-deployment-vars.sh -if ! "${MW_COMMON}/multiversion/activeMWVersions" "$@"; then +if ! /usr/local/apache/common-local/multiversion/activeMWVersions "$@"; then exit 1 fi diff --git a/files/scap/scap-1 b/files/scap/scap-1 index 8bf326d..8ec196b 100755 --- a/files/scap/scap-1 +++ b/files/scap/scap-1 @@ -1,10 +1,8 @@ #!/bin/bash -. /usr/local/lib/mw-deployment-vars.sh - -if [ ! -d "${MW_COMMON}" ];then - if ! install -d -o mwdeploy -g mwdeploy "${MW_COMMON}"; then - echo "Unable to create ${MW_COMMON}, please re-run this script as root." +if [ ! -d /usr/local/apache/common-local ];then + if ! install -d -o mwdeploy -g mwdeploy /usr/local/apache/common-local; then + echo "Unable to create common-local, please re-run this script as root." exit 1 fi fi @@ -22,7 +20,7 @@ SERVER=$(sudo /usr/local/bin/find-nearest-rsync $RSYNC_SERVERS) fi if [ -z "$SERVER" ]; then - SERVER="${MW_RSYNC_HOST}" + SERVER=tin.eqiad.wmnet fi sudo -u mwdeploy /usr/local/bin/scap-2 "$SERVER" diff --git a/files/scap/scap-1skins b/files/scap/scap-1skins index b4ffe8f..df542a8 100755 --- a/files/scap/scap-1skins +++ b/files/scap/scap-1skins @@ -1,7 +1,5 @@ #!/bin/bash -. /usr/local/lib/mw-deployment-vars.sh - mwVersionNums=$(mwversionsinuse) if [ -z "$mwVersionNums" ]; then echo "Unable to read wikiversions.dat or it is empty" @@ -10,8 +8,8 @@ for mwVerNum in ${mwVersionNums[@]}; do sudo -u mwdeploy sh -c " - echo rsync -a --no-perms ${MW_RSYNC_HOST}::common/php-${mwVerNum}/skins/ \ - ${MW_COMMON}/php-${mwVerNum}/skins && \ + rsync -a --no-perms tin.eqiad.wmnet::common/php-$mwVerNum/skins/ \ + /usr/local/apache/common-local/php-$mwVerNum/skins && \ echo ok || \ echo failed " diff --git a/files/scap/scap-2 b/files/scap/scap-2 index db89ad5..6a111e2 100755 --- a/files/scap/scap-2 +++ b/files/scap/scap-2 @@ -3,18 +3,22 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin: TERM=dumb -. /usr/local/lib/mw-deployment-vars.sh - SERVER="$1" if [ -z "$SERVER" ]; then - SERVER="${MW_RSYNC_HOST}" + SERVER=tin.eqiad.wmnet fi echo -n Copying to `hostname -s` from "$SERVER"... -if rsync "${MW_RSYNC_ARGS[@]}" "$SERVER"::common/ "${MW_COMMON}" +if rsync -a --delete \ + --exclude=**/.svn/lock \ + --exclude=**/.git/objects \ + --exclude=**/.git/**/objects \ + --no-perms \ + "$SERVER"::common/ /usr/local/apache/common-local then echo "ok" else echo "failed" exit 1 fi + diff --git a/files/scap/sync-common-file b/files/scap/sync-common-file index cd95b16..7fd4787 100755 --- a/files/scap/sync-common-file +++ b/files/scap/sync-common-file @@ -39,12 +39,12 @@ if [ -d "$MW_COMMON_SOURCE/$DIR" ]; then DESTDIR=$MW_COMMON/$DIR - dsh "${MW_DSH_ARGS[@]}" -- " - sudo -u mwdeploy rsync ${MW_RSYNC_ARGS[*]} --exclude=cache/l10n $MW_RSYNC_HOST::common/$DIR/ $DESTDIR + dsh -cM -g mediawiki-installation -o -oSetupTimeout=30 -F30 -- " + sudo -u mwdeploy rsync -a --delete --exclude=.svn --exclude=.git --exclude=cache/l10n --no-perms $MW_RSYNC_HOST::common/$DIR/ $DESTDIR " else DESTDIR=$(dirname $MW_COMMON/$DIR) - dsh "${MW_DSH_ARGS[@]}" -- " + dsh -cM -g mediawiki-installation -o -oSetupTimeout=30 -F30 -- " sudo -u mwdeploy rsync -l $MW_RSYNC_HOST::common/$DIR $DESTDIR " fi diff --git a/files/scap/sync-dblist b/files/scap/sync-dblist index a9e847f..9d24029 100755 --- a/files/scap/sync-dblist +++ b/files/scap/sync-dblist @@ -5,7 +5,7 @@ echo "Synchronizing $MW_COMMON_SOURCE/*.dblist to $MW_COMMON/*.dblist..." echo "mediawiki-installation:" -dsh "${MW_DSH_ARGS[@]}" -- " +dsh -cM -g mediawiki-installation -o -oSetupTimeout=30 -F30 " sudo -u mwdeploy rsync -a $MW_RSYNC_HOST::common/*.dblist $MW_COMMON " diff --git a/files/scap/sync-docroot b/files/scap/sync-docroot index 2c86916..32960b2 100755 --- a/files/scap/sync-docroot +++ b/files/scap/sync-docroot @@ -2,7 +2,7 @@ . /usr/local/lib/mw-deployment-vars.sh echo "Synchronizing $MW_COMMON_SOURCE/docroot to $MW_COMMON/docroot..." -dsh "${MW_DSH_ARGS[@]}" -- "sudo -u mwdeploy rsync -a --no-perms $MW_RSYNC_HOST::common/docroot $MW_RSYNC_HOST::common/w $MW_COMMON" +dsh -cM -g mediawiki-installation -o -oSetupTimeout=30 -F30 -- "sudo -u mwdeploy rsync -a --no-perms $MW_RSYNC_HOST::common/docroot $MW_RSYNC_HOST::common/w $MW_COMMON" echo "done!" BINDIR=/usr/local/bin diff --git a/files/scap/sync-wikiversions b/files/scap/sync-wikiversions index 150093d..41e4e51 100755 --- a/files/scap/sync-wikiversions +++ b/files/scap/sync-wikiversions @@ -20,7 +20,7 @@ # Copy files to apaches echo -n 'Copying wikiversions dat and cdb files to apaches...' -dsh "${MW_DSH_ARGS[@]}" -- "sudo -u mwdeploy rsync -l $MW_RSYNC_HOST::common/wikiversions.{dat,cdb} $MW_COMMON" +dsh -cM -g mediawiki-installation -o -oSetupTimeout=30 -F30 -- "sudo -u mwdeploy rsync -l $MW_RSYNC_HOST::common/wikiversions.{dat,cdb} $MW_COMMON" echo 'Finished' diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp index d57a25d..bae6080 100644 --- a/manifests/misc/deployment.pp +++ b/manifests/misc/deployment.pp @@ -160,14 +160,15 @@ # Scripts for the new git-deploy deployment system class misc::deployment::scripts { - include misc::deployment::common_scripts - class { "misc::deployment::vars": system => "git-deploy" } + include misc::deployment::vars, + misc::deployment::common_scripts } # Scripts for the old rsync-based deployment system class misc::deployment::scap_scripts { include misc::deployment::common_scripts - include misc::deployment::vars + + class { "misc::deployment::vars": system => "scap" } $scriptpath = "/usr/local/bin" @@ -356,7 +357,7 @@ } } -class misc::deployment::vars ($system = 'scap') { +class misc::deployment::vars ($system = "git-deploy") { if $system == "git-deploy" { $mw_common = "/srv/deployment/mediawiki/common" $mw_common_source = $mw_common diff --git a/modules/mediawiki/manifests/sync.pp b/modules/mediawiki/manifests/sync.pp index abc216b..c415bb6 100644 --- a/modules/mediawiki/manifests/sync.pp +++ b/modules/mediawiki/manifests/sync.pp @@ -1,8 +1,6 @@ # mediawiki syncing class class mediawiki::sync { - include misc::deployment::vars - require mediawiki::packages require mediawiki::users::l10nupdate diff --git a/templates/misc/mw-deployment-vars.erb b/templates/misc/mw-deployment-vars.erb index 4b43af0..2e27364 100644 --- a/templates/misc/mw-deployment-vars.erb +++ b/templates/misc/mw-deployment-vars.erb @@ -4,5 +4,3 @@ MW_DBLISTS_SOURCE=<%= dblist_common_source %> MW_CRON_LOGS=/home/wikipedia/logs/norotate MW_RSYNC_HOST=tin.eqiad.wmnet -MW_DSH_ARGS=('-cM' '-g' 'mediawiki-installation' '-o' '-oSetupTimeout=30' '-F30') -MW_RSYNC_ARGS=('-a' '--delete' '--exclude=**/.svn/lock' '--exclude=**/.git/objects' '--exclude=**/.git/**/objects' '--no-perms') -- To view, visit https://gerrit.wikimedia.org/r/71967 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4e6675efe28d89e52453b0e2d494881e82cef005 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Tim Starling <tstarl...@wikimedia.org> Gerrit-Reviewer: Tim Starling <tstarl...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits