r52120 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r52119‎ | r52120 | r52121 >
Date:16:07, 18 June 2009
Author:mark
Status:deferred
Tags:
Comment:
wikimedia-task-appserver (1.39) hardy; urgency=medium

* Factor out install of texvc executable in /usr/local/bin into separate
sudo script install-common
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/install-common (added) (history)
  • /trunk/debs/wikimedia-task-appserver/scap15-2 (modified) (history)
  • /trunk/debs/wikimedia-task-appserver/sudoers (modified) (history)
  • /trunk/debs/wikimedia-task-appserver/sync-common (modified) (history)

Diff [purge]

Index: trunk/debs/wikimedia-task-appserver/debian/changelog
@@ -1,3 +1,10 @@
 2+wikimedia-task-appserver (1.39) hardy; urgency=medium
 3+
 4+ * Factor out install of texvc executable in /usr/local/bin into separate
 5+ sudo script install-common
 6+
 7+ -- Mark Bergsma <mark@wikimedia.org> Thu, 18 Jun 2009 15:58:00 +0000
 8+
29 wikimedia-task-appserver (1.38) hardy; urgency=low
310
411 * Adapt sudoers file to new, /home-less situation
Index: trunk/debs/wikimedia-task-appserver/debian/rules
@@ -58,7 +58,7 @@
5959 install -d -m 0755 $(DESTDIR)/usr/bin
6060 install -d -m 0755 $(DESTDIR)/usr/sbin
6161 install -m 0750 sync-common apache-sanity-check apache-start check-time scap15-1skins scap15-1 $(DESTDIR)/usr/bin
62 - install -m 0750 scap15-2 set-group-write2 $(DESTDIR)/usr/sbin
 62+ install -m 0750 scap15-2 set-group-write2 install-common $(DESTDIR)/usr/sbin
6363
6464 install -d -m 0750 $(DESTDIR)/var/lib/pybal-check/.ssh
6565 install -m 0640 authorized_keys $(DESTDIR)/var/lib/pybal-check/.ssh/authorized_keys
Index: trunk/debs/wikimedia-task-appserver/sync-common
@@ -18,7 +18,7 @@
1919 rsync -r --exclude=.svn/ 10.0.5.8::common/php-1.5/math/ /var/tmp/texvc
2020 cd /var/tmp/texvc
2121 make -f Makefile texvc >/dev/null 2>/dev/null && echo ok || echo failed
22 -cp /var/tmp/texvc/texvc /usr/local/bin/
 22+sudo /usr/sbin/install-common
2323 rm -rf /var/tmp/texvc
2424
2525 # rsync common
Index: trunk/debs/wikimedia-task-appserver/sudoers
@@ -19,7 +19,14 @@
2020 /etc/init.d/apache2, \
2121 /usr/sbin/scap15-2, \
2222 /usr/sbin/set-group-write2, \
23 - /usr/bin/renice
 23+ /usr/sbin/install-common, \
 24+ /usr/bin/renice, \
 25+ /home/wikipedia/sbin/apache-kill-it, \
 26+ /home/wikipedia/sbin/sync-common-it, \
 27+ /home/wikipedia/sbin/sync-common-php, \
 28+ /home/wikipedia/sbin/scap15-2, \
 29+ /home/wikipedia/sbin/unscap-2, \
 30+ /home/wikipedia/sbin/set-group-write2
2431
2532 # User privilege specification
2633 root ALL=(ALL) ALL
Index: trunk/debs/wikimedia-task-appserver/scap15-2
@@ -6,7 +6,7 @@
77 rsync -a 10.0.5.8::common/php-1.5/ /usr/local/apache/common-local/php-1.5 && echo ok || echo failed
88
99 # Install compiled executables
10 -cp /var/tmp/texvc/texvc /usr/local/bin/
 10+/usr/sbin/install-common
1111
1212 echo -n "Restarting apache... "
1313 /usr/bin/apache-sanity-check && ( sudo /usr/sbin/apache2ctl stop; sudo killall -9 apache2;sleep 3; sudo /usr/sbin/apache2ctl start )
Index: trunk/debs/wikimedia-task-appserver/install-common
@@ -0,0 +1,3 @@
 2+#!/bin/sh
 3+
 4+cp /var/tmp/texvc/texvc /usr/local/bin/

Status & tagging log