r40821 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r40820‎ | r40821 | r40822 >
Date:16:07, 14 September 2008
Author:mark
Status:old
Tags:
Comment:
wikimedia-task-appserver (1.26) hardy; urgency=low

* Add account setup for PyBal SSH checking
* Add debhelper to the build dependencies
Modified paths:
  • /trunk/debs/wikimedia-task-appserver/authorized_keys (added) (history)
  • /trunk/debs/wikimedia-task-appserver/debian/changelog (modified) (history)
  • /trunk/debs/wikimedia-task-appserver/debian/control (modified) (history)
  • /trunk/debs/wikimedia-task-appserver/debian/postinst (modified) (history)
  • /trunk/debs/wikimedia-task-appserver/debian/postrm (modified) (history)
  • /trunk/debs/wikimedia-task-appserver/debian/preinst (modified) (history)
  • /trunk/debs/wikimedia-task-appserver/debian/rules (modified) (history)

Diff [purge]

Index: trunk/debs/wikimedia-task-appserver/debian/control
@@ -3,6 +3,7 @@
44 Priority: optional
55 Maintainer: River Tarnell <river@wikimedia.org>
66 Standards-Version: 3.6.2
 7+Build-Depends: debhelper (>= 4.0.0)
78
89 Package: wikimedia-task-appserver
910 Architecture: all
Index: trunk/debs/wikimedia-task-appserver/debian/postinst
@@ -56,6 +56,8 @@
5757 fi
5858 fi
5959
 60+ chown pybal-check:pybal-check /var/lib/pybal-check/.ssh/authorized_keys
 61+
6062 checkmount amane:/export/upload /mnt/upload3
6163 checkmount amane:/export/math /mnt/math
6264 checkmount storage1.wikimedia.org:/export/upload /mnt/upload4
Index: trunk/debs/wikimedia-task-appserver/debian/postrm
@@ -29,6 +29,10 @@
3030
3131 case "$1" in
3232 purge)
 33+ # Remove PyBal check user account
 34+ deluser pybal-check
 35+ rm -rf /var/lib/pybal-check
 36+
3337 dpkg-divert --package wikimedia-task-appserver --rename --remove /etc/apache2/apache2.conf
3438 dpkg-divert --package wikimedia-task-appserver --rename --remove /etc/php5/apache2/php.ini
3539 dpkg-divert --package wikimedia-task-appserver --rename --remove /usr/share/php5/php.ini-dist
@@ -36,16 +40,16 @@
3741 dpkg-divert --package wikimedia-task-appserver --rename --remove /etc/apache2/envvars
3842 ;;
3943 remove)
40 - removemount /mnt/upload3
41 - removemount /mnt/upload4
42 - removemount /mnt/math
 44+ removemount /mnt/upload3
 45+ removemount /mnt/upload4
 46+ removemount /mnt/math
4347 ;;
4448
4549 upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
4650 removemount /mnt/upload3
47 - removemount /mnt/upload4
 51+ removemount /mnt/upload4
4852 removemount /mnt/math
49 - ;;
 53+ ;;
5054
5155 *)
5256 echo "postrm called with unknown argument \`$1'" >&2
Index: trunk/debs/wikimedia-task-appserver/debian/preinst
@@ -27,11 +27,19 @@
2828 --divert /etc/sudoers.default /etc/sudoers
2929 dpkg-divert --package wikimedia-task-appserver --add --rename \
3030 --divert /etc/apache2/envvars.default /etc/apache2/envvars
 31+
 32+ # Create user for the PyBal checks
 33+ adduser --system --home /var/lib/pybal-check --group --disabled-password --shell /bin/sh pybal-check
3134 ;;
3235
33 - upgrade|abort-upgrade)
 36+ upgrade)
 37+ # Create user for the PyBal checks
 38+ adduser --system --home /var/lib/pybal-check --group --disabled-password --shell /bin/sh pybal-check
3439 ;;
3540
 41+ abort-upgrade)
 42+ ;;
 43+
3644 *)
3745 echo "preinst called with unknown argument \`$1'" >&2
3846 exit 1
Index: trunk/debs/wikimedia-task-appserver/debian/changelog
@@ -1,3 +1,10 @@
 2+wikimedia-task-appserver (1.26) hardy; urgency=low
 3+
 4+ * Add account setup for PyBal SSH checking
 5+ * Add debhelper to the build dependencies
 6+
 7+ -- Mark Bergsma <mark@wikimedia.org> Sun, 14 Sep 2008 15:42:44 +0000
 8+
29 wikimedia-task-appserver (1.25) hardy; urgency=low
310
411 * Added /mnt/upload4 to the NFS mount list
Index: trunk/debs/wikimedia-task-appserver/debian/rules
@@ -54,6 +54,9 @@
5555 install -m 0644 php.ini $(DESTDIR)/usr/share/php5/php.ini-dist
5656 install -m 0400 sudoers $(DESTDIR)/etc/
5757
 58+ install -d -m 0750 $(DESTDIR)/var/lib/pybal-check/.ssh
 59+ install -m 0640 authorized_keys $(DESTDIR)/var/lib/pybal-check/.ssh/authorized_keys
 60+
5861 # Build architecture-independent files here.
5962 binary-indep: build install
6063 # We have nothing to do by default.
Index: trunk/debs/wikimedia-task-appserver/authorized_keys
@@ -0,0 +1 @@
 2+command="uptime; touch /var/tmp/pybal-check.stamp" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAwyiL/ImTNOjoP/8k1UFQRM9pcspHp3yIsH/8TYXH/HJ1rQVjMleq6IQ6ZwAXhKfw/v1xV28SbkctB8pISZoR4rcCqOIN+osXkCB419JydCEb5abPS4mB5Gkn2bZAF43DGr5kaW+HYIsgtZ+QEC+nS4j3NA/Bjb7lAbHUtHVuC6BCOaZfGf+Q2FO4Z6xC7zc/1ngaDgvrXYzyCvXzTAQmcZH0d2/GoS1DQoLdLzqu66aZK1dmn9TAHV4a3R4gp7El7OzVHqDp1E6y0sopd+qKNAw/3GgXC91XJ3XO22h+ZnVovIpIS01CJ6GiBig/55Xrh//9Wuw5GFQuCptYbPQr4Q== root@lvs4