Index: trunk/debs/wikimedia-task-appserver/debian/control |
— | — | @@ -3,6 +3,7 @@ |
4 | 4 | Priority: optional |
5 | 5 | Maintainer: River Tarnell <river@wikimedia.org> |
6 | 6 | Standards-Version: 3.6.2 |
| 7 | +Build-Depends: debhelper (>= 4.0.0) |
7 | 8 | |
8 | 9 | Package: wikimedia-task-appserver |
9 | 10 | Architecture: all |
Index: trunk/debs/wikimedia-task-appserver/debian/postinst |
— | — | @@ -56,6 +56,8 @@ |
57 | 57 | fi |
58 | 58 | fi |
59 | 59 | |
| 60 | + chown pybal-check:pybal-check /var/lib/pybal-check/.ssh/authorized_keys |
| 61 | + |
60 | 62 | checkmount amane:/export/upload /mnt/upload3 |
61 | 63 | checkmount amane:/export/math /mnt/math |
62 | 64 | checkmount storage1.wikimedia.org:/export/upload /mnt/upload4 |
Index: trunk/debs/wikimedia-task-appserver/debian/postrm |
— | — | @@ -29,6 +29,10 @@ |
30 | 30 | |
31 | 31 | case "$1" in |
32 | 32 | purge) |
| 33 | + # Remove PyBal check user account |
| 34 | + deluser pybal-check |
| 35 | + rm -rf /var/lib/pybal-check |
| 36 | + |
33 | 37 | dpkg-divert --package wikimedia-task-appserver --rename --remove /etc/apache2/apache2.conf |
34 | 38 | dpkg-divert --package wikimedia-task-appserver --rename --remove /etc/php5/apache2/php.ini |
35 | 39 | dpkg-divert --package wikimedia-task-appserver --rename --remove /usr/share/php5/php.ini-dist |
— | — | @@ -36,16 +40,16 @@ |
37 | 41 | dpkg-divert --package wikimedia-task-appserver --rename --remove /etc/apache2/envvars |
38 | 42 | ;; |
39 | 43 | 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 |
43 | 47 | ;; |
44 | 48 | |
45 | 49 | upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) |
46 | 50 | removemount /mnt/upload3 |
47 | | - removemount /mnt/upload4 |
| 51 | + removemount /mnt/upload4 |
48 | 52 | removemount /mnt/math |
49 | | - ;; |
| 53 | + ;; |
50 | 54 | |
51 | 55 | *) |
52 | 56 | echo "postrm called with unknown argument \`$1'" >&2 |
Index: trunk/debs/wikimedia-task-appserver/debian/preinst |
— | — | @@ -27,11 +27,19 @@ |
28 | 28 | --divert /etc/sudoers.default /etc/sudoers |
29 | 29 | dpkg-divert --package wikimedia-task-appserver --add --rename \ |
30 | 30 | --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 |
31 | 34 | ;; |
32 | 35 | |
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 |
34 | 39 | ;; |
35 | 40 | |
| 41 | + abort-upgrade) |
| 42 | + ;; |
| 43 | + |
36 | 44 | *) |
37 | 45 | echo "preinst called with unknown argument \`$1'" >&2 |
38 | 46 | 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 | + |
2 | 9 | wikimedia-task-appserver (1.25) hardy; urgency=low |
3 | 10 | |
4 | 11 | * Added /mnt/upload4 to the NFS mount list |
Index: trunk/debs/wikimedia-task-appserver/debian/rules |
— | — | @@ -54,6 +54,9 @@ |
55 | 55 | install -m 0644 php.ini $(DESTDIR)/usr/share/php5/php.ini-dist |
56 | 56 | install -m 0400 sudoers $(DESTDIR)/etc/ |
57 | 57 | |
| 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 | + |
58 | 61 | # Build architecture-independent files here. |
59 | 62 | binary-indep: build install |
60 | 63 | # 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 |