r16892 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r16891‎ | r16892 | r16893 >
Date:13:53, 9 October 2006
Author:mark
Status:old
Tags:
Comment:
* Clean up the MOTD line
* Use server group configs (squid.conf) only for recognized server names
* Remove some unnecessary lines
* Include a Wikimedia APT repository
Modified paths:
  • /trunk/ubuntu/autoinstall/common.cfg (modified) (history)
  • /trunk/ubuntu/autoinstall/netboot.cfg (modified) (history)

Diff [purge]

Index: trunk/ubuntu/autoinstall/common.cfg
@@ -1,16 +1,8 @@
22 # some basic configs, may be overridden by other files
3 -base-config base-config/intro note
4 -base-config base-config/login note
53 base-config tzconfig/gmt boolean true
64 d-i clock-setup/utc boolean true
75 d-i time/zone string UTC
86
9 -exim4-config exim4/dc_eximconfig_configtype select no configuration at this time
10 -exim4-config exim4/no_config boolean true
11 -exim4-config exim4/dc_postmaster string
12 -
13 -popularity-contest popularity-contest/participate boolean false
14 -
157 # For some reason this question is asked on hppa and a few other arches
168 # (due to serial console install?)
179 console-data console-data/keymap/policy select Don't touch keymap
@@ -25,10 +17,17 @@
2618 d-i pkgsel/language-pack-patterns string
2719 d-i pkgsel/install-language-support bool false
2820
 21+# Wikimedia's APT repository
 22+d-i apt-setup/local0/comment string Wikimedia APT repository
 23+d-i apt-setup/local0/repository string http://apt.wikimedia.org/ wikimedia/dapper main contrib non-free
 24+d-i apt-setup/local0/source boolean true
 25+#d-i apt-setup/local0/key string http://local.server/key
 26+
2927 # Architecture specific settings (kernels etc)
3028 d-i preseed/include_command string echo $(uname -m).cfg
3129
3230 # Redo network configuration statically
3331 d-i preseed/early_command string echo d-i netcfg/get_ipaddress string $(ifconfig | grep "inet addr" | cut -d ' ' -f 12 | sed 's/addr://' | grep -v 127\.0\.0\.1) > /tmp/static_net.cfg && debconf-set-selections /tmp/static_net.cfg && killall.sh; netcfg; true
 32+
3433 # Individual additional packages to install
35 -d-i preseed/late_command string apt-install openssh-server build-essential zsh sysstat bc joe ntp-simple; mkdir /target/root/.ssh && wget -O /target/root/.ssh/authorized_keys http://www.knams.wikimedia.org/autoinstall/ssh/authorized_keys && chmod go-rwx /target/root/.ssh/authorized_keys; rm -f /usr/lib/prebaseconfig.d/90console && sed -i -e "s/^#T0:/T0:/" /target/etc/inittab; chroot /target /bin/sh -c 'echo -e \\n$(cat /etc/issue.net) auto-installed on $(date) using $Revision$. > /etc/motd'
 34+d-i preseed/late_command string apt-install openssh-server build-essential zsh sysstat bc joe ntp-simple; mkdir /target/root/.ssh && wget -O /target/root/.ssh/authorized_keys http://www.knams.wikimedia.org/autoinstall/ssh/authorized_keys && chmod go-rwx /target/root/.ssh/authorized_keys; rm -f /usr/lib/prebaseconfig.d/90console && sed -i -e "s/^#T0:/T0:/" /target/etc/inittab; chroot /target /bin/sh -c 'echo -e \\n$(cat /etc/issue.net) auto-installed on $(date). > /etc/motd'
Index: trunk/ubuntu/autoinstall/netboot.cfg
@@ -1,6 +1,6 @@
22 # configs for installing via netboot
33
44 # Generally we'll do a basic server install.
5 -d-i preseed/include string common.cfg passwd.cfg squid.cfg override.cfg
 5+d-i preseed/include string common.cfg passwd.cfg override.cfg
66
7 -d-i preseed/include_command string case $(debconf-get netcfg/get_domain) in wikimedia.org) echo pmtpa.cfg ;; knams.wikimedia.org) echo knams.cfg ;; yaseo.wikimedia.org) echo yaseo.cfg ;; esac
 7+d-i preseed/include_command string case $(debconf-get netcfg/get_domain) in wikimedia.org) echo pmtpa.cfg ;; knams.wikimedia.org) echo knams.cfg ;; yaseo.wikimedia.org) echo yaseo.cfg ;; esac; case $(debconf-get netcfg/get_hostname) in sq[0-9]|sq[0-9][0-9]|yf100[67]) echo squid.cfg ;; esac