| Index: trunk/debs/wikimedia-base/debian/postinst |
| — | — | @@ -18,6 +18,7 @@ |
| 19 | 19 | # |
| 20 | 20 | |
| 21 | 21 | . /usr/share/debconf/confmodule |
| | 22 | +. /lib/lsb/init-functions |
| 22 | 23 | |
| 23 | 24 | case "$1" in |
| 24 | 25 | configure) |
| — | — | @@ -55,11 +56,14 @@ |
| 56 | 57 | pmtpa) |
| 57 | 58 | NTP_SERVER=zwinger.wikimedia.org |
| 58 | 59 | ;; |
| | 60 | + yaseo) |
| | 61 | + NTP_SERVER=amaryllis.yaseo.wikimedia.org |
| | 62 | + ;; |
| 59 | 63 | esac |
| 60 | 64 | if [ -n "$NTP_SERVER" ] && ! grep -q "^server $NTP_SERVER" /etc/ntp.conf |
| 61 | 65 | then |
| 62 | 66 | sed -i -e "/^server ntp\.ubuntu\.com/s/ntp\.ubuntu\.com/$NTP_SERVER/" /etc/ntp.conf |
| 63 | | - invoke-rc.d ntp-server restart |
| | 67 | + log_warning_msg "New NTP server set, please restart ntpd manually!" |
| 64 | 68 | fi |
| 65 | 69 | |
| 66 | 70 | # Optimize TCP |
| — | — | @@ -98,7 +102,7 @@ |
| 99 | 103 | if ! [ -f /var/run/smartd.pid ] || ! kill -0 $(cat /var/run/smartd.pid) |
| 100 | 104 | then |
| 101 | 105 | sed -i -e '/^#start_smartd=yes/s/^#//' /etc/default/smartmontools |
| 102 | | - invoke-rc.d smartmontools start |
| | 106 | + invoke-rc.d smartmontools start || true |
| 103 | 107 | fi |
| 104 | 108 | ;; |
| 105 | 109 | |
| Index: trunk/debs/wikimedia-base/debian/changelog |
| — | — | @@ -1,3 +1,12 @@ |
| | 2 | +wikimedia-base (0.08) dapper; urgency=low |
| | 3 | + |
| | 4 | + * Set amaryllis as NTP server for yaseo, as all others are firewalled off |
| | 5 | + * Do not restart ntpd, as it hangs the upgrade process for some reason |
| | 6 | + * Ignore failed smartd starts, as they are normal on systems without |
| | 7 | + (recognized) disks, e.g. SATA disks |
| | 8 | + |
| | 9 | + -- Mark Bergsma <mark@wikimedia.org> Sun, 15 Oct 2006 15:45:29 +0000 |
| | 10 | + |
| 2 | 11 | wikimedia-base (0.07) dapper; urgency=low |
| 3 | 12 | |
| 4 | 13 | * Enable smartd disk monitoring |