r95713 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r95712‎ | r95713 | r95714 >
Date:22:20, 29 August 2011
Author:aaron
Status:ok (Comments)
Tags:
Comment:
* Updated scripts with the ones from /multiversion/scripts (mwversionsinuse added)
* Bumped change log
Modified paths:
  • /trunk/debs/wikimedia-task-appserver/debian/changelog (modified) (history)
  • /trunk/debs/wikimedia-task-appserver/debian/rules (modified) (history)
  • /trunk/debs/wikimedia-task-appserver/mwversionsinuse (added) (history)
  • /trunk/debs/wikimedia-task-appserver/scap-1skins (modified) (history)
  • /trunk/debs/wikimedia-task-appserver/scap-2 (modified) (history)

Diff [purge]

Index: trunk/debs/wikimedia-task-appserver/scap-2
——@@ -1,40 +1,51 @@
2 -#!/bin/bash
3 -
4 -PATH=/bin:/usr/bin:/sbin:/usr/sbin:
5 -
6 -echo -n Copying to `hostname -s`...
7 -if rsync -a --delete --exclude=**/.svn/lock --no-perms \
8 - 10.0.5.8::common/ /usr/local/apache/common-local
9 -then
10 - echo ok
11 -else
12 - echo failed
13 - exit 1
14 -fi
15 -
16 -
17 -echo -n Compiling texvc...
18 -
19 -builddir=`mktemp -dt texvc-build.XXXXXXXXXX`
20 -if [ -z "$builddir" ]; then
21 - echo "Unable to create temporary directory"
22 - exit 1
23 -fi
24 -
25 -rsync -r --exclude=.svn/ /usr/local/apache/common-local/php-1.17/math/ "$builddir"
26 -cd "$builddir"
27 -if make -f Makefile texvc >/dev/null 2>/dev/null; then
28 - echo ok
29 - install -d /usr/local/apache/uncommon/1.17/bin
30 - install -m 755 "$builddir"/texvc /usr/local/apache/uncommon/1.17/bin
31 -else
32 - echo failed
33 - exit 1
34 -fi
35 -rm -r "$builddir"
36 -cd /
37 -
38 -
39 -#echo -n "Restarting apache... "
40 -#/usr/bin/apache-sanity-check && ( sudo /usr/sbin/apache2ctl stop; sudo killall -9 apache2;sleep 3; sudo /usr/sbin/apache2ctl start )
41 -
 2+#!/bin/bash
 3+
 4+PATH=/bin:/usr/bin:/sbin:/usr/sbin:
 5+
 6+echo -n Copying to `hostname -s`...
 7+if rsync -a --delete --exclude=**/.svn/lock --no-perms \
 8+ 10.0.5.8::common/ /usr/local/apache/common-local
 9+then
 10+ echo "ok"
 11+else
 12+ echo "failed"
 13+ exit 1
 14+fi
 15+
 16+# wikiversions.dat just synced above
 17+mwVersionNums=`mwversionsinuse`
 18+if [ -z "$mwVersionNums" ]; then
 19+ echo "Unable to read wikiversions.dat or it is empty"
 20+ exit 1
 21+fi
 22+
 23+for mwVerNum in "${mwVersionNums[@]}"
 24+do
 25+ echo "MediaWiki $mwVerNum: Compiling texvc..."
 26+ builddir=`mktemp -dt texvc-build.XXXXXXXXXX`
 27+ if [ -z "$builddir" ]; then
 28+ echo "Unable to create temporary directory"
 29+ exit 1
 30+ fi
 31+
 32+ IP=/usr/local/apache/common-local/php-"$mwVerNum"
 33+ # Math was moved out to an extension in MW 1.18
 34+ if [ -d $IP/extensions/Math/math ]; then
 35+ MATHPATH=$IP/extensions/Math/math
 36+ else
 37+ MATHPATH=$IP/math
 38+ fi
 39+
 40+ rsync -r --exclude=.svn/ $MATHPATH/ "$builddir"
 41+ cd "$builddir"
 42+ if make -f Makefile texvc >/dev/null 2>/dev/null; then
 43+ echo "ok"
 44+ install -d /usr/local/apache/uncommon/"$mwVerNum"/bin
 45+ install -m 755 "$builddir"/texvc /usr/local/apache/uncommon/"$mwVerNum"/bin
 46+ else
 47+ echo "failed"
 48+ exit 1
 49+ fi
 50+ rm -r "$builddir"
 51+ cd /
 52+done
Index: trunk/debs/wikimedia-task-appserver/scap-1skins
——@@ -1,8 +1,12 @@
22 #!/bin/bash
33
4 -sudo -u mwdeploy sh -c '
5 -rsync -a --no-perms 10.0.5.8::common/php-1.17/skins/ \
6 -/usr/local/apache/common-local/php-1.17/skins && \
7 -echo ok || \
8 -echo failed
9 -'
 4+mwVersionNums=`mwversionsinuse`
 5+for mwVerNum in "${mwVersionNums[@]}"
 6+do
 7+ sudo -u mwdeploy sh -c "
 8+ rsync -a --no-perms 10.0.5.8::common/php-$mwVerNum/skins/ \
 9+ /usr/local/apache/common-local/php-$mwVerNum/skins && \
 10+ echo ok || \
 11+ echo failed
 12+ "
 13+done
Index: trunk/debs/wikimedia-task-appserver/mwversionsinuse
——@@ -0,0 +1,6 @@
 2+#!/bin/sh
 3+# Shell wrapper for the local version of multiversion/activeMWVersions.
 4+# This script belongs in /usr/bin/ and should be in PATH.
 5+if ! /usr/local/apache/common-local/multiversion/activeMWVersions "$@"; then
 6+ exit 1
 7+fi
Index: trunk/debs/wikimedia-task-appserver/debian/changelog
——@@ -1,3 +1,9 @@
 2+wikimedia-task-appserver (2.3-1) lucid-wikimedia; urgency=low
 3+
 4+ * Updated deploy scripts for Heterogeneous Deployment
 5+
 6+ -- Aaron Schulz <aschulz@wikimedia.org> Mon, 29 Aug 2011 22:12:13 +0000
 7+
28 wikimedia-task-appserver (2.2-1) lucid-wikimedia; urgency=low
39
410 * Added mwdeploy privilege separation.
——@@ -39,9 +45,9 @@
4046 -- Mark Bergsma <mark@wikimedia.org> Fri, 25 Feb 2011 17:14:13 +0000
4147
4248 wikimedia-task-appserver (1.47) hardy-wikimedia; urgency=low
43 -
 49+
4450 * Updated sync scripts for MW 11.17
45 -
 51+
4652 -- Tim Starling <tstarling@wikimedia.org> Tue, 01 Mar 2011 13:13:43 +1100
4753
4854 wikimedia-task-appserver (1.46-2~hardy1) hardy-wikimedia; urgency=low
——@@ -138,7 +144,7 @@
139145
140146 wikimedia-task-appserver (1.33) hardy; urgency=low
141147
142 - * Added /mnt/upload5 to the remove list, removed /mnt/upload4 from the
 148+ * Added /mnt/upload5 to the remove list, removed /mnt/upload4 from the
143149 install list since it's apparently dysfunctional.
144150
145151 -- Tim Starling <tstarling@wikimedia.org> Thu, 29 Jan 2009 12:22:40 +1100
——@@ -238,38 +244,38 @@
239245
240246 wikimedia-task-appserver (1.17) feisty; urgency=low
241247
242 - * log_errors=On
 248+ * log_errors=On
243249
244250 -- Tim Starling <tstarling@wikimedia.org> Wed, 29 Aug 2007 14:08:12 +0000
245251
246252 wikimedia-task-appserver (1.16) feisty; urgency=low
247253
248 - * Added /etc/apache2/envvars
 254+ * Added /etc/apache2/envvars
249255
250256 -- Tim Starling <tstarling@wikimedia.org> Wed, 29 Aug 2007 00:46:34 +0000
251257
252258 wikimedia-task-appserver (1.15) feisty; urgency=low
253259
254 - * No, really, mode 400 for sudoers.
 260+ * No, really, mode 400 for sudoers.
255261 * Diversion for sudoers
256262
257263 -- Tim Starling <tstarling@wikimedia.org> Tue, 28 Aug 2007 23:56:38 +0000
258264
259265 wikimedia-task-appserver (1.14) feisty; urgency=low
260266
261 - * Remove conf file diversions on purge, not on remove
 267+ * Remove conf file diversions on purge, not on remove
262268
263269 -- Tim Starling <tstarling@wikimedia.org> Tue, 28 Aug 2007 23:15:36 +0000
264270
265271 wikimedia-task-appserver (1.13) feisty; urgency=low
266272
267 - * Handle diversions only on install and remove
 273+ * Handle diversions only on install and remove
268274
269275 -- Tim Starling <tstarling@wikimedia.org> Tue, 28 Aug 2007 19:38:06 +0000
270276
271277 wikimedia-task-appserver (1.12) feisty; urgency=low
272278
273 - * Fixed permissions on /etc/sudoers
 279+ * Fixed permissions on /etc/sudoers
274280
275281 -- Tim Starling <tstarling@wikimedia.org> Tue, 28 Aug 2007 19:05:28 +0000
276282
——@@ -326,25 +332,25 @@
327333
328334 wikimedia-task-appserver (1.4) feisty; urgency=low
329335
330 - * Depend on additional X fonts.
 336+ * Depend on additional X fonts.
331337
332338 -- River Tarnell <river@wikimedia.org> Sun, 13 May 2007 16:20:43 +0000
333339
334340 wikimedia-task-appserver (1.3) feisty; urgency=low
335341
336 - * Automatically add/remove required mounts from amane.
 342+ * Automatically add/remove required mounts from amane.
337343
338344 -- River Tarnell <river@wikimedia.org> Sun, 13 May 2007 15:02:35 +0000
339345
340346 wikimedia-task-appserver (1.2) feisty; urgency=low
341347
342 - * Depend on some additional packages required for MediaWiki.
 348+ * Depend on some additional packages required for MediaWiki.
343349
344350 -- River Tarnell <river@wikimedia.org> Sun, 13 May 2007 08:45:37 +0000
345351
346352 wikimedia-task-appserver (1.1) feisty; urgency=low
347353
348 - * Install the required infastructure under /usr/local/apache for sync-* etc.
 354+ * Install the required infastructure under /usr/local/apache for sync-* etc.
349355
350356 -- River Tarnell <river@wikimedia.org> Sat, 12 May 2007 19:28:44 +0000
351357
Index: trunk/debs/wikimedia-task-appserver/debian/rules
——@@ -29,7 +29,7 @@
3030
3131 build: build-stamp
3232
33 -build-stamp: configure-stamp
 33+build-stamp: configure-stamp
3434 dh_testdir
3535
3636 touch build-stamp
——@@ -39,19 +39,19 @@
4040 dh_testroot
4141 rm -f build-stamp configure-stamp
4242
43 - dh_clean
 43+ dh_clean
4444
4545 install: build
4646 dh_testdir
4747 dh_testroot
48 - dh_clean -k
 48+ dh_clean -k
4949 dh_installdirs
5050 dh_link
51 -
 51+
5252 # Install sync/check scripts
5353 install -d -m 0755 $(DESTDIR)/usr/bin
5454 install -d -m 0755 $(DESTDIR)/usr/sbin
55 - install -m 0755 sync-common apache-sanity-check apache-start check-time scap-1skins scap-1 scap-2 $(DESTDIR)/usr/bin
 55+ install -m 0755 sync-common apache-sanity-check apache-start check-time scap-1skins scap-1 scap-2 mwversionsinuse $(DESTDIR)/usr/bin
5656
5757 # Build architecture-independent files here.
5858 binary-indep: build install
——@@ -61,12 +61,12 @@
6262 binary-arch: build install
6363 dh_testdir
6464 dh_testroot
65 - dh_installchangelogs
 65+ dh_installchangelogs
6666 dh_installdocs
6767 dh_installexamples
6868 # dh_install
6969 # dh_installmenu
70 -# dh_installdebconf
 70+# dh_installdebconf
7171 # dh_installlogrotate
7272 # dh_installemacsen
7373 # dh_installpam

Follow-up revisions

RevisionCommit summaryAuthorDate
r95805eol-style nativeaaron19:08, 30 August 2011

Comments

#Comment by RobLa-WMF (talk | contribs)   19:19, 30 August 2011

Note: all of these changes were already reviewed here (which I've independently verified): http://www.mediawiki.org/w/index.php?title=Special:Code/MediaWiki&path=%2Ftrunk%2Ftools%2Fmwmultiversion%2Fscripts

There was a problem with EOL-characters, but Aaron fixed that with r95805

Status & tagging log