r50993 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r50992‎ | r50993 | r50994 >
Date:21:39, 25 May 2009
Author:mark
Status:deferred
Tags:
Comment:
wikimedia-task-appserver (1.38) hardy; urgency=low

* Adapt sudoers file to new, /home-less situation
* Add scap scripts
* Add script set-group-write2
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/scap15-1 (added) (history)
  • /trunk/debs/wikimedia-task-appserver/scap15-1skins (added) (history)
  • /trunk/debs/wikimedia-task-appserver/scap15-2 (added) (history)
  • /trunk/debs/wikimedia-task-appserver/set-group-write2 (added) (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/set-group-write2
@@ -0,0 +1,9 @@
 2+#!/bin/bash
 3+
 4+PATH=/bin:/usr/bin:/sbin:/usr/sbin
 5+
 6+target1=/var/tmp/texvc
 7+target2=/apache/common/php-1.5
 8+
 9+find $target1 -group wikidev -not -perm -020 -perm -200 -exec chmod g+w '{}' ';'
 10+find $target2 -group wikidev -not -perm -020 -perm -200 -exec chmod g+w '{}' ';'
Index: trunk/debs/wikimedia-task-appserver/debian/changelog
@@ -1,3 +1,11 @@
 2+wikimedia-task-appserver (1.38) hardy; urgency=low
 3+
 4+ * Adapt sudoers file to new, /home-less situation
 5+ * Add scap scripts
 6+ * Add script set-group-write2
 7+
 8+ -- Mark Bergsma <mark@wikimedia.org> Mon, 25 May 2009 20:49:05 +0000
 9+
210 wikimedia-task-appserver (1.37) hardy; urgency=low
311
412 * Added dependency for xpdf-utils to satisfy pfd extension requirements.
Index: trunk/debs/wikimedia-task-appserver/debian/rules
@@ -56,7 +56,9 @@
5757
5858 # Install sync/check scripts
5959 install -d -m 0755 $(DESTDIR)/usr/bin
60 - install -m 0750 sync-common apache-sanity-check apache-start check-time $(DESTDIR)/usr/bin
 60+ install -d -m 0755 $(DESTDIR)/usr/sbin
 61+ 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
6163
6264 install -d -m 0750 $(DESTDIR)/var/lib/pybal-check/.ssh
6365 install -m 0640 authorized_keys $(DESTDIR)/var/lib/pybal-check/.ssh/authorized_keys
Index: trunk/debs/wikimedia-task-appserver/scap15-1skins
@@ -0,0 +1,5 @@
 2+#!/bin/sh
 3+
 4+rsync -a 10.0.5.8::common/php-1.5/skins/ \
 5+ /usr/local/apache/common-local/php-1.5/skins \
 6+ && echo ok || echo failed
Index: trunk/debs/wikimedia-task-appserver/sync-common
@@ -19,6 +19,7 @@
2020 cd /var/tmp/texvc
2121 make -f Makefile texvc >/dev/null 2>/dev/null && echo ok || echo failed
2222 cp /var/tmp/texvc/texvc /usr/local/bin/
 23+rm -rf /var/tmp/texvc
2324
2425 # rsync common
2526 echo -n Copying to `hostname -s`...
Index: trunk/debs/wikimedia-task-appserver/sudoers
@@ -17,12 +17,8 @@
1818 Cmnd_Alias ADMIN_COMMANDS = \
1919 /usr/sbin/apache2ctl, \
2020 /etc/init.d/apache2, \
21 - /home/wikipedia/sbin/apache-kill-it, \
22 - /home/wikipedia/sbin/sync-common-it, \
23 - /home/wikipedia/sbin/sync-common-php, \
24 - /home/wikipedia/sbin/scap15-2, \
25 - /home/wikipedia/sbin/unscap-2, \
26 - /home/wikipedia/sbin/set-group-write2, \
 21+ /usr/sbin/scap15-2, \
 22+ /usr/sbin/set-group-write2, \
2723 /usr/bin/renice
2824
2925 # User privilege specification
Index: trunk/debs/wikimedia-task-appserver/scap15-1
@@ -0,0 +1,14 @@
 2+#!/bin/sh
 3+
 4+# Compile as regular user
 5+echo -n Compiling texvc...
 6+[ -d /var/tmp/texvc ] || mkdir /var/tmp/texvc
 7+rsync -r --exclude=.svn/ 10.0.5.8::common/php-1.5/math/ /var/tmp/texvc
 8+cd /var/tmp/texvc
 9+make -f Makefile texvc >/dev/null 2>/dev/null && echo ok || echo failed
 10+
 11+# Copy and install as root
 12+sudo /usr/sbin/scap15-2
 13+
 14+echo Done
 15+
Index: trunk/debs/wikimedia-task-appserver/scap15-2
@@ -0,0 +1,13 @@
 2+#!/bin/bash
 3+
 4+PATH=/bin:/usr/bin:/sbin:/usr/sbin:
 5+
 6+echo -n Updating php-1.5...
 7+rsync -a 10.0.5.8::common/php-1.5/ /usr/local/apache/common-local/php-1.5 && echo ok || echo failed
 8+
 9+# Install compiled executables
 10+cp /var/tmp/texvc/texvc /usr/local/bin/
 11+
 12+echo -n "Restarting apache... "
 13+/usr/bin/apache-sanity-check && ( sudo /usr/sbin/apache2ctl stop; sudo killall -9 apache2;sleep 3; sudo /usr/sbin/apache2ctl start )
 14+

Status & tagging log