| Index: trunk/debs/wikimedia-task-appserver/debian/postinst |
| — | — | @@ -2,6 +2,7 @@ |
| 3 | 3 | # postinst script for wikimedia-task-dns-auth |
| 4 | 4 | # |
| 5 | 5 | # see: dh_installdeb(1) |
| | 6 | +# vim: set sw=4 ts=4 noet : |
| 6 | 7 | |
| 7 | 8 | set -e |
| 8 | 9 | |
| — | — | @@ -18,24 +19,24 @@ |
| 19 | 20 | # |
| 20 | 21 | |
| 21 | 22 | checkmount() { |
| 22 | | - dev=$1 |
| 23 | | - mnt=$2 |
| | 23 | + dev=$1 |
| | 24 | + mnt=$2 |
| 24 | 25 | |
| 25 | | - [ -d $mnt ] || { |
| 26 | | - mkdir -p $mnt |
| 27 | | - echo "created $mnt" >&2 |
| 28 | | - } |
| | 26 | + [ -d $mnt ] || { |
| | 27 | + mkdir -p $mnt |
| | 28 | + echo "created $mnt" >&2 |
| | 29 | + } |
| 29 | 30 | |
| 30 | | - grep -qs "^$dev" /etc/fstab || { |
| 31 | | - echo "Adding $mnt mount..." >&2 |
| 32 | | - echo >>/etc/fstab \ |
| 33 | | - "$dev $mnt nfs bg,soft,udp,rsize=8192,wsize=8192,timeo=14,intr,nfsvers=3 0 0" |
| 34 | | - mount $mnt || true |
| 35 | | - } |
| | 31 | + grep -qs "^$dev" /etc/fstab || { |
| | 32 | + echo "Adding $mnt mount..." >&2 |
| | 33 | + echo >>/etc/fstab \ |
| | 34 | + "$dev $mnt nfs bg,soft,udp,rsize=8192,wsize=8192,timeo=14,intr,nfsvers=3 0 0" |
| | 35 | + mount $mnt || true |
| | 36 | + } |
| 36 | 37 | } |
| 37 | 38 | |
| 38 | 39 | case "$1" in |
| 39 | | - configure) |
| | 40 | + configure) |
| 40 | 41 | # Add a line to /etc/motd describing the task of this server |
| 41 | 42 | if [ -f /etc/motd.tail ] |
| 42 | 43 | then |
| — | — | @@ -50,17 +51,18 @@ |
| 51 | 52 | |
| 52 | 53 | if [ -f /etc/motd.tail ] |
| 53 | 54 | then |
| 54 | | - # Update motd |
| | 55 | + # Update motd |
| 55 | 56 | uname -snrvm > /var/run/motd |
| 56 | | - cat /etc/motd.tail >> /var/run/motd |
| | 57 | + cat /etc/motd.tail >> /var/run/motd |
| 57 | 58 | fi |
| 58 | 59 | fi |
| 59 | 60 | |
| 60 | | - chown -R pybal-check:pybal-check /var/lib/pybal-check/.ssh |
| | 61 | + chown -R pybal-check:pybal-check /var/lib/pybal-check/.ssh |
| 61 | 62 | |
| 62 | | - checkmount amane:/export/upload /mnt/upload3 |
| 63 | | - checkmount amane:/export/math /mnt/math |
| 64 | | - checkmount storage1.wikimedia.org:/export/upload /mnt/upload4 |
| | 63 | + checkmount amane:/export/upload /mnt/upload3 |
| | 64 | + checkmount amane:/export/math /mnt/math |
| | 65 | + checkmount storage1.wikimedia.org:/export/upload /mnt/upload4 |
| | 66 | + checkmount ms1.wikimedia.org:/export/upload /mnt/upload5 |
| 65 | 67 | |
| 66 | 68 | CLUSTER=$(cat /etc/wikimedia-cluster) |
| 67 | 69 | if [ $CLUSTER="pmtpa" ] |
| — | — | @@ -73,16 +75,16 @@ |
| 74 | 76 | else |
| 75 | 77 | echo "remember to sync this server before you start it!" |
| 76 | 78 | fi |
| 77 | | - ;; |
| | 79 | + ;; |
| 78 | 80 | |
| 79 | | - abort-upgrade|abort-remove|abort-deconfigure) |
| | 81 | + abort-upgrade|abort-remove|abort-deconfigure) |
| 80 | 82 | |
| 81 | | - ;; |
| | 83 | + ;; |
| 82 | 84 | |
| 83 | | - *) |
| 84 | | - echo "postinst called with unknown argument \`$1'" >&2 |
| 85 | | - exit 1 |
| 86 | | - ;; |
| | 85 | + *) |
| | 86 | + echo "postinst called with unknown argument \`$1'" >&2 |
| | 87 | + exit 1 |
| | 88 | + ;; |
| 87 | 89 | esac |
| 88 | 90 | |
| 89 | 91 | # dh_installdeb will replace this with shell code automatically |
| Index: trunk/debs/wikimedia-task-appserver/debian/changelog |
| — | — | @@ -1,3 +1,9 @@ |
| | 2 | +wikimedia-task-appserver (1.32) hardy; urgency=low |
| | 3 | + |
| | 4 | + * Added /mnt/upload5 to postinst |
| | 5 | + |
| | 6 | + -- Tim Starling <tstarling@wikimedia.org> Thu, 29 Jan 2009 12:02:42 +1100 |
| | 7 | + |
| 2 | 8 | wikimedia-task-appserver (1.31) hardy; urgency=low |
| 3 | 9 | |
| 4 | 10 | * Bumped post and upload limits to 100M, we're trying it out... |