| Index: trunk/debs/wikimedia-base/debian/control |
| — | — | @@ -8,7 +8,7 @@ |
| 9 | 9 | Package: wikimedia-base |
| 10 | 10 | Architecture: all |
| 11 | 11 | Origin: Wikimedia |
| 12 | | -Pre-Depends: ntp-server, smartmontools |
| | 12 | +Pre-Depends: ntp |
| 13 | 13 | Depends: ${shlibs:Depends}, ${misc:Depends}, openssh-server, sysstat, zsh, vim, joe, traceroute, screen, gdb, ntp, ssmtp | mail-transport-agent, acct |
| 14 | 14 | Description: Base requirements for any Wikimedia server |
| 15 | 15 | wikimedia-base provides the Wikimedia specific base requirements |
| — | — | @@ -18,5 +18,4 @@ |
| 19 | 19 | * Finds out which Wikimedia cluster the host belongs to |
| 20 | 20 | * Sets APT package pinning for Wikimedia packages |
| 21 | 21 | * Sets up NTP |
| 22 | | - * Set up SMART disk monitoring |
| 23 | 22 | * Set up process accounting |
| Index: trunk/debs/wikimedia-base/debian/postinst |
| — | — | @@ -48,17 +48,14 @@ |
| 49 | 49 | |
| 50 | 50 | # Disable the 'quiet' kernel command line option so console messages |
| 51 | 51 | # will be printed. |
| 52 | | - if grep -q "^# defoptions.*[= ]quiet " /boot/grub/menu.lst |
| | 52 | + if [ -f /boot/grub/menu.lst ] && grep -q "^# defoptions.*[= ]quiet " /boot/grub/menu.lst |
| 53 | 53 | then |
| 54 | 54 | sed -i '/^# defoptions.*[= ]quiet /s/quiet //' /boot/grub/menu.lst |
| 55 | 55 | update-grub |
| 56 | | - fi |
| 57 | | - |
| 58 | | - # Remote syslogging |
| 59 | | - if [ $CLUSTERNAME = "pmtpa" ] && ! grep -q "@syslog\.pmtpa\.wmnet" /etc/syslog.conf |
| | 56 | + elif [ -f /etc/default/grub ] && grep -q '^GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"' /etc/default/grub |
| 60 | 57 | then |
| 61 | | - echo "*.info;mail.none;authpriv.none;cron.none @syslog.pmtpa.wmnet" >> /etc/syslog.conf |
| 62 | | - invoke-rc.d sysklogd restart |
| | 58 | + sed -i '/^GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"/s/quiet splash//' /etc/default/grub |
| | 59 | + update-grub |
| 63 | 60 | fi |
| 64 | 61 | |
| 65 | 62 | # Optimize TCP |
| — | — | @@ -73,13 +70,6 @@ |
| 74 | 71 | --slave /usr/share/man/man1/editor.1.gz editor.1.gz \ |
| 75 | 72 | /usr/share/man/man1/vim.1.gz |
| 76 | 73 | |
| 77 | | - # Enable smartd |
| 78 | | - if ! [ -f /var/run/smartd.pid ] || ! kill -0 $(cat /var/run/smartd.pid) |
| 79 | | - then |
| 80 | | - sed -i -e '/^#start_smartd=yes/s/^#//' /etc/default/smartmontools |
| 81 | | - invoke-rc.d smartmontools start || true |
| 82 | | - fi |
| 83 | | - |
| 84 | 74 | # Enable some aliases in /root/.bashrc |
| 85 | 75 | sed -i ' |
| 86 | 76 | /^#alias ll=/ s/^#// |
| Index: trunk/debs/wikimedia-base/debian/changelog |
| — | — | @@ -1,3 +1,22 @@ |
| | 2 | +wikimedia-base (0.24) hardy; urgency=low |
| | 3 | + |
| | 4 | + * Disable "quiet splash" default kernel boot options in grub2 |
| | 5 | + |
| | 6 | + -- Mark Bergsma <mark@wikimedia.org> Mon, 30 Nov 2009 18:16:33 +0000 |
| | 7 | + |
| | 8 | +wikimedia-base (0.23) hardy; urgency=low |
| | 9 | + |
| | 10 | + * Remove remote syslog setup |
| | 11 | + * Remove smartmontools |
| | 12 | + |
| | 13 | + -- Mark Bergsma <mark@wikimedia.org> Mon, 30 Nov 2009 14:54:29 +0000 |
| | 14 | + |
| | 15 | +wikimedia-base (0.22) hardy; urgency=low |
| | 16 | + |
| | 17 | + * Remove outdated dependency on ntp-server; no longer available in karmic |
| | 18 | + |
| | 19 | + -- root <root@wikimedia.org> Thu, 05 Nov 2009 17:38:23 +0000 |
| | 20 | + |
| 2 | 21 | wikimedia-base (0.21) hardy; urgency=low |
| 3 | 22 | |
| 4 | 23 | * Remove NTP configuration; this is now done by puppet (pmtpa) or not at all |