| Index: trunk/debs/wikimedia-task-appserver/debian/postinst |
| — | — | @@ -61,7 +61,6 @@ |
| 62 | 62 | |
| 63 | 63 | checkmount amane:/export/upload /mnt/upload3 |
| 64 | 64 | checkmount amane:/export/math /mnt/math |
| 65 | | - checkmount storage1.wikimedia.org:/export/upload /mnt/upload4 |
| 66 | 65 | checkmount ms1.wikimedia.org:/export/upload /mnt/upload5 |
| 67 | 66 | |
| 68 | 67 | CLUSTER=$(cat /etc/wikimedia-cluster) |
| Index: trunk/debs/wikimedia-task-appserver/debian/postrm |
| — | — | @@ -18,42 +18,44 @@ |
| 19 | 19 | # the debian-policy package |
| 20 | 20 | |
| 21 | 21 | removemount() { |
| 22 | | - mnt=$1 |
| 23 | | - grep -qs "$mnt.*nfs" /etc/fstab && { |
| 24 | | - echo "Removing $mnt from fstab" |
| 25 | | - sed -i "\\,$mnt,d" /etc/fstab |
| 26 | | - } |
| | 22 | + mnt=$1 |
| | 23 | + grep -qs "$mnt.*nfs" /etc/fstab && { |
| | 24 | + echo "Removing $mnt from fstab" |
| | 25 | + sed -i "\\,$mnt,d" /etc/fstab |
| | 26 | + } |
| 27 | 27 | |
| 28 | | - umount $mnt || true |
| | 28 | + umount $mnt || true |
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | case "$1" in |
| 32 | | - purge) |
| 33 | | - # Remove PyBal check user account |
| 34 | | - deluser pybal-check |
| | 32 | + purge) |
| | 33 | + # Remove PyBal check user account |
| | 34 | + deluser pybal-check |
| 35 | 35 | rm -rf /var/lib/pybal-check |
| 36 | 36 | |
| 37 | | - dpkg-divert --package wikimedia-task-appserver --rename --remove /etc/apache2/apache2.conf |
| 38 | | - dpkg-divert --package wikimedia-task-appserver --rename --remove /etc/php5/apache2/php.ini |
| | 37 | + dpkg-divert --package wikimedia-task-appserver --rename --remove /etc/apache2/apache2.conf |
| | 38 | + dpkg-divert --package wikimedia-task-appserver --rename --remove /etc/php5/apache2/php.ini |
| 39 | 39 | dpkg-divert --package wikimedia-task-appserver --rename --remove /usr/share/php5/php.ini-dist |
| 40 | 40 | dpkg-divert --package wikimedia-task-appserver --rename --remove /etc/sudoers |
| 41 | | - dpkg-divert --package wikimedia-task-appserver --rename --remove /etc/apache2/envvars |
| | 41 | + dpkg-divert --package wikimedia-task-appserver --rename --remove /etc/apache2/envvars |
| 42 | 42 | ;; |
| 43 | | - remove) |
| 44 | | - removemount /mnt/upload3 |
| 45 | | - removemount /mnt/upload4 |
| 46 | | - removemount /mnt/math |
| 47 | | - ;; |
| | 43 | + remove) |
| | 44 | + removemount /mnt/upload3 |
| | 45 | + removemount /mnt/upload4 |
| | 46 | + removemount /mnt/upload5 |
| | 47 | + removemount /mnt/math |
| | 48 | + ;; |
| 48 | 49 | |
| 49 | | - upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) |
| 50 | | - removemount /mnt/upload3 |
| 51 | | - removemount /mnt/upload4 |
| 52 | | - removemount /mnt/math |
| 53 | | - ;; |
| | 50 | + upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) |
| | 51 | + removemount /mnt/upload3 |
| | 52 | + removemount /mnt/upload4 |
| | 53 | + removemount /mnt/upload5 |
| | 54 | + removemount /mnt/math |
| | 55 | + ;; |
| 54 | 56 | |
| 55 | | - *) |
| 56 | | - echo "postrm called with unknown argument \`$1'" >&2 |
| 57 | | - exit 1 |
| | 57 | + *) |
| | 58 | + echo "postrm called with unknown argument \`$1'" >&2 |
| | 59 | + exit 1 |
| 58 | 60 | |
| 59 | 61 | esac |
| 60 | 62 | |
| Index: trunk/debs/wikimedia-task-appserver/debian/preinst |
| — | — | @@ -16,34 +16,34 @@ |
| 17 | 17 | |
| 18 | 18 | |
| 19 | 19 | case "$1" in |
| 20 | | - install) |
| 21 | | - dpkg-divert --package wikimedia-task-appserver --add --rename \ |
| 22 | | - --divert /etc/apache2/apache2.conf.default /etc/apache2/apache2.conf |
| 23 | | - dpkg-divert --package wikimedia-task-appserver --add --rename \ |
| 24 | | - --divert /etc/php5/apache2/php.ini.default /etc/php5/apache2/php.ini |
| 25 | | - dpkg-divert --package wikimedia-task-appserver --add --rename \ |
| 26 | | - --divert /usr/share/php5/php.ini-dist.default /usr/share/php5/php.ini-dist |
| 27 | | - dpkg-divert --package wikimedia-task-appserver --add --rename \ |
| 28 | | - --divert /etc/sudoers.default /etc/sudoers |
| 29 | | - dpkg-divert --package wikimedia-task-appserver --add --rename \ |
| 30 | | - --divert /etc/apache2/envvars.default /etc/apache2/envvars |
| | 20 | + install) |
| | 21 | + dpkg-divert --package wikimedia-task-appserver --add --rename \ |
| | 22 | + --divert /etc/apache2/apache2.conf.default /etc/apache2/apache2.conf |
| | 23 | + dpkg-divert --package wikimedia-task-appserver --add --rename \ |
| | 24 | + --divert /etc/php5/apache2/php.ini.default /etc/php5/apache2/php.ini |
| | 25 | + dpkg-divert --package wikimedia-task-appserver --add --rename \ |
| | 26 | + --divert /usr/share/php5/php.ini-dist.default /usr/share/php5/php.ini-dist |
| | 27 | + dpkg-divert --package wikimedia-task-appserver --add --rename \ |
| | 28 | + --divert /etc/sudoers.default /etc/sudoers |
| | 29 | + dpkg-divert --package wikimedia-task-appserver --add --rename \ |
| | 30 | + --divert /etc/apache2/envvars.default /etc/apache2/envvars |
| 31 | 31 | |
| 32 | | - # Create user for the PyBal checks |
| 33 | | - adduser --system --home /var/lib/pybal-check --group --disabled-password --shell /bin/sh pybal-check |
| 34 | | - ;; |
| | 32 | + # Create user for the PyBal checks |
| | 33 | + adduser --system --home /var/lib/pybal-check --group --disabled-password --shell /bin/sh pybal-check |
| | 34 | + ;; |
| 35 | 35 | |
| 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 |
| 39 | | - ;; |
| | 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 |
| | 39 | + ;; |
| 40 | 40 | |
| 41 | | - abort-upgrade) |
| 42 | | - ;; |
| | 41 | + abort-upgrade) |
| | 42 | + ;; |
| 43 | 43 | |
| 44 | | - *) |
| 45 | | - echo "preinst called with unknown argument \`$1'" >&2 |
| 46 | | - exit 1 |
| 47 | | - ;; |
| | 44 | + *) |
| | 45 | + echo "preinst called with unknown argument \`$1'" >&2 |
| | 46 | + exit 1 |
| | 47 | + ;; |
| 48 | 48 | esac |
| 49 | 49 | |
| 50 | 50 | # dh_installdeb will replace this with shell code automatically |
| Index: trunk/debs/wikimedia-task-appserver/debian/prerm |
| — | — | @@ -18,34 +18,37 @@ |
| 19 | 19 | |
| 20 | 20 | |
| 21 | 21 | case "$1" in |
| 22 | | - remove|deconfigure) |
| 23 | | - # Add a line to /etc/motd describing the task of this server |
| 24 | | - if [ -f /etc/motd.tail ] |
| 25 | | - then |
| 26 | | - MOTDFILE=/etc/motd.tail |
| 27 | | - else |
| 28 | | - MOTDFILE=/etc/motd |
| 29 | | - fi |
| | 22 | + remove|deconfigure) |
| | 23 | + # Add a line to /etc/motd describing the task of this server |
| | 24 | + if [ -f /etc/motd.tail ] |
| | 25 | + then |
| | 26 | + MOTDFILE=/etc/motd.tail |
| | 27 | + else |
| | 28 | + MOTDFILE=/etc/motd |
| | 29 | + fi |
| 30 | 30 | |
| 31 | | - sed -i '/is a.*(wikimedia-task-appserver).$/d' $MOTDFILE |
| | 31 | + sed -i '/is a.*(wikimedia-task-appserver).$/d' $MOTDFILE |
| 32 | 32 | |
| 33 | | - if [ -f /etc/motd.tail ] |
| 34 | | - then |
| 35 | | - # Update motd |
| 36 | | - uname -snrvm > /var/run/motd |
| 37 | | - cat /etc/motd.tail >> /var/run/motd |
| 38 | | - fi |
| | 33 | + if [ -f /etc/motd.tail ] |
| | 34 | + then |
| | 35 | + # Update motd |
| | 36 | + uname -snrvm > /var/run/motd |
| | 37 | + cat /etc/motd.tail >> /var/run/motd |
| | 38 | + fi |
| 39 | 39 | |
| 40 | | - [ -x /etc/init.d/apache2 ] && /etc/init.d/apache2 stop |
| 41 | | - ;; |
| 42 | | - upgrade) |
| 43 | | - ;; |
| 44 | | - failed-upgrade) |
| 45 | | - ;; |
| 46 | | - *) |
| 47 | | - echo "prerm called with unknown argument \`$1'" >&2 |
| 48 | | - exit 1 |
| 49 | | - ;; |
| | 40 | + [ -x /etc/init.d/apache2 ] && /etc/init.d/apache2 stop |
| | 41 | + ;; |
| | 42 | + |
| | 43 | + upgrade) |
| | 44 | + ;; |
| | 45 | + |
| | 46 | + failed-upgrade) |
| | 47 | + ;; |
| | 48 | + |
| | 49 | + *) |
| | 50 | + echo "prerm called with unknown argument \`$1'" >&2 |
| | 51 | + exit 1 |
| | 52 | + ;; |
| 50 | 53 | esac |
| 51 | 54 | |
| 52 | 55 | # dh_installdeb will replace this with shell code automatically |
| Index: trunk/debs/wikimedia-task-appserver/debian/changelog |
| — | — | @@ -1,3 +1,10 @@ |
| | 2 | +wikimedia-task-appserver (1.33) hardy; urgency=low |
| | 3 | + |
| | 4 | + * Added /mnt/upload5 to the remove list, removed /mnt/upload4 from the |
| | 5 | + install list since it's apparently dysfunctional. |
| | 6 | + |
| | 7 | + -- Tim Starling <tstarling@wikimedia.org> Thu, 29 Jan 2009 12:22:40 +1100 |
| | 8 | + |
| 2 | 9 | wikimedia-task-appserver (1.32) hardy; urgency=low |
| 3 | 10 | |
| 4 | 11 | * Added /mnt/upload5 to postinst |