http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94204
Revision: 94204
Author: aaron
Date: 2011-08-10 21:54:38 +0000 (Wed, 10 Aug 2011)
Log Message:
-----------
* Make sure wikiversions.dat is copied over before running scap-1skins
* Removed unecessary /home dependency from set-group-write2
* Comment tweaks and minor code cleanups
* Added EOL-style
Modified Paths:
--------------
trunk/tools/mwmultiversion/scripts/scap
trunk/tools/mwmultiversion/scripts/set-group-write2
Added Paths:
-----------
trunk/tools/mwmultiversion/scripts/scap-1versions
Property Changed:
----------------
trunk/tools/mwmultiversion/scripts/l10nupdate
trunk/tools/mwmultiversion/scripts/mwversionsinuse
trunk/tools/mwmultiversion/scripts/scap
trunk/tools/mwmultiversion/scripts/scap-1skins
trunk/tools/mwmultiversion/scripts/scap-2
trunk/tools/mwmultiversion/scripts/set-group-write2
trunk/tools/mwmultiversion/scripts/sync-l10nupdate
Property changes on: trunk/tools/mwmultiversion/scripts/l10nupdate
___________________________________________________________________
Added: svn:executable
+ *
Property changes on: trunk/tools/mwmultiversion/scripts/mwversionsinuse
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/tools/mwmultiversion/scripts/scap
===================================================================
--- trunk/tools/mwmultiversion/scripts/scap 2011-08-10 21:54:27 UTC (rev
94203)
+++ trunk/tools/mwmultiversion/scripts/scap 2011-08-10 21:54:38 UTC (rev
94204)
@@ -39,7 +39,8 @@
# Update the current machine so that serialization works.
-# wikiversions.cdb update is pushed and mwscript works.
+# Push wikiversions.cdb changes so mwversionsinuse, set-group-write,
+# and mwscript work with the right version of the files.
$BINDIR/sync-common
@@ -63,11 +64,14 @@
# Copy
$BINDIR/set-group-write
-echo Copying style sheets to apaches...
+echo 'Copying wikiversions dat file to apaches...'
+ddsh -F30 -cM -g mediawiki-installation 'if [ -x
/home/wikipedia/bin/scap-1versions ]; then echo "/home-mounted apache
$(hostname)"; /home/wikipedia/bin/scap-1versions; else /usr/bin/scap-1versions;
fi'
+
+echo 'Copying style sheets to apaches...'
ddsh -F30 -cM -g mediawiki-installation 'if [ -x
/home/wikipedia/bin/scap-1skins ]; then echo "/home-mounted apache
$(hostname)"; /home/wikipedia/bin/scap-1skins; else /usr/bin/scap-1skins; fi'
-echo Copying code to apaches...
+echo 'Copying code to apaches...'
ddsh -F30 -cM -g mediawiki-installation 'if [ -x /home/wikipedia/bin/scap-1 ];
then echo "/home-mounted apache $(hostname)"; /home/wikipedia/bin/scap-1; else
/usr/bin/scap-1; fi'
-echo Finished
+echo 'Finished'
$BINDIR/dologmsg "sync done."
Property changes on: trunk/tools/mwmultiversion/scripts/scap
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:eol-style
+ native
Property changes on: trunk/tools/mwmultiversion/scripts/scap-1skins
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:eol-style
+ native
Added: trunk/tools/mwmultiversion/scripts/scap-1versions
===================================================================
--- trunk/tools/mwmultiversion/scripts/scap-1versions
(rev 0)
+++ trunk/tools/mwmultiversion/scripts/scap-1versions 2011-08-10 21:54:38 UTC
(rev 94204)
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+sudo -u mwdeploy rsync -l 10.0.5.8::common/wikiversions.dat
/usr/local/apache/common-local/wikiversions.dat
Property changes on: trunk/tools/mwmultiversion/scripts/scap-1versions
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:eol-style
+ native
Property changes on: trunk/tools/mwmultiversion/scripts/scap-2
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/tools/mwmultiversion/scripts/set-group-write2
===================================================================
--- trunk/tools/mwmultiversion/scripts/set-group-write2 2011-08-10 21:54:27 UTC
(rev 94203)
+++ trunk/tools/mwmultiversion/scripts/set-group-write2 2011-08-10 21:54:38 UTC
(rev 94204)
@@ -1,15 +1,15 @@
-#!/bin/bash
-if [ $HOSTNAME == fenari ]; then
- targetbase=/home/wikipedia/common
-else
- targetbase=/apache/common
-fi
-
-mwVersionNums=`mwversionsinuse --home`
-for mwVerNum in "${mwVersionNums[@]}"
-do
- find "$targetbase"/php-"$mwVerNum" -group wikidev -not -perm -020 -exec
chmod g+w '{}' ';'
-done
-
-find "$targetbase"/wmf-config -group wikidev -not -perm -020 -exec chmod g+w
'{}' ';'
-find "$targetbase"/multiversion -group wikidev -not -perm -020 -exec chmod g+w
'{}' ';'
+#!/bin/bash
+if [ $HOSTNAME == fenari ]; then
+ TARGETBASE=/home/wikipedia/common
+else
+ TARGETBASE=/apache/common
+fi
+
+mwVersionNums=`mwversionsinuse`
+for mwVerNum in "${mwVersionNums[@]}"
+do
+ find "$TARGETBASE"/php-"$mwVerNum" -group wikidev -not -perm -020 -exec
chmod g+w '{}' ';'
+done
+
+find "$TARGETBASE"/wmf-config -group wikidev -not -perm -020 -exec chmod g+w
'{}' ';'
+find "$TARGETBASE"/multiversion -group wikidev -not -perm -020 -exec chmod g+w
'{}' ';'
Property changes on: trunk/tools/mwmultiversion/scripts/set-group-write2
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:eol-style
+ native
Property changes on: trunk/tools/mwmultiversion/scripts/sync-l10nupdate
___________________________________________________________________
Added: svn:executable
+ *
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
