r40106 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r40105‎ | r40106 | r40107 >
Date:21:03, 27 August 2008
Author:mark
Status:old
Tags:
Comment:
Fix occasional unassigned hostname problem, preseed NTP
Modified paths:
  • /trunk/ubuntu/autoinstall/knams.cfg (modified) (history)
  • /trunk/ubuntu/autoinstall/pmtpa-internal.cfg (modified) (history)
  • /trunk/ubuntu/autoinstall/pmtpa-squid.cfg (modified) (history)
  • /trunk/ubuntu/autoinstall/pmtpa.cfg (modified) (history)
  • /trunk/ubuntu/autoinstall/yaseo.cfg (modified) (history)

Diff [purge]

Index: trunk/ubuntu/autoinstall/pmtpa.cfg
@@ -3,8 +3,9 @@
44 # Select interface that has a link
55 d-i netcfg/choose_interface select auto
66
7 -d-i netcfg/get_hostname string unassigned-hostname
8 -d-i netcfg/get_domain string unassigned-domain
 7+# get_domain should be set, get_hostname is overwritten by DHCP
 8+#d-i netcfg/get_hostname string unassigned-hostname
 9+d-i netcfg/get_domain string wikimedia.org
910
1011 d-i netcfg/disable_dhcp boolean true
1112 # ip address is taken from DHCP, rest is set here
@@ -22,6 +23,9 @@
2324
2425 d-i apt-setup/security_host string security.ubuntu.com
2526
 27+# NTP
 28+d-i clock-setup/ntp-server string ntp.pmtpa.wikimedia.org
 29+
2630 # ssmtp settings
2731 ssmtp ssmtp/mailhub string smtp.pmtpa.wmnet
2832 ssmtp ssmtp/fromoverride boolean true
Index: trunk/ubuntu/autoinstall/pmtpa-internal.cfg
@@ -3,8 +3,9 @@
44 # Select interface that has a link
55 d-i netcfg/choose_interface select auto
66
7 -d-i netcfg/get_hostname string unassigned-hostname
8 -d-i netcfg/get_domain string unassigned-domain
 7+# get_domain should be set, get_hostname is overwritten by DHCP
 8+#d-i netcfg/get_hostname string unassigned-hostname
 9+d-i netcfg/get_domain string pmtpa.wmnet
910
1011 d-i netcfg/disable_dhcp boolean true
1112 # ip address is taken from DHCP, rest is set here
@@ -23,6 +24,9 @@
2425 d-i apt-setup/security_host string security.ubuntu.com
2526 d-i apt-setup/security-updates-failed note
2627
 28+# NTP
 29+d-i clock-setup/ntp-server string ntp.pmtpa.wikimedia.org
 30+
2731 # ssmtp settings
2832 ssmtp ssmtp/mailhub string smtp.pmtpa.wmnet
2933 ssmtp ssmtp/fromoverride boolean true
Index: trunk/ubuntu/autoinstall/pmtpa-squid.cfg
@@ -3,8 +3,9 @@
44 # Select interface that has a link
55 d-i netcfg/choose_interface select auto
66
7 -d-i netcfg/get_hostname string unassigned-hostname
8 -d-i netcfg/get_domain string unassigned-domain
 7+# get_domain should be set, get_hostname is overwritten by DHCP
 8+#d-i netcfg/get_hostname string unassigned-hostname
 9+d-i netcfg/get_domain string wikimedia.org
910
1011 d-i netcfg/disable_dhcp boolean true
1112 # ip address is taken from DHCP, rest is set here
Index: trunk/ubuntu/autoinstall/knams.cfg
@@ -11,8 +11,10 @@
1212 d-i netcfg/get_nameservers string 91.198.174.6 208.80.152.131
1313 d-i netcfg/confirm_static boolean true
1414
15 -d-i netcfg/get_hostname string unassigned-hostname
16 -d-i netcfg/get_domain string unassigned-domain
 15+# get_domain should be set, get_hostname is overwritten by DHCP
 16+#d-i netcfg/get_hostname string unassigned-hostname
 17+d-i netcfg/get_domain string knams.wikimedia.org
 18+
1719 d-i netcfg/wireless_wep string
1820
1921 ### Mirror settings
@@ -24,6 +26,9 @@
2527
2628 d-i apt-setup/security_host string security.ubuntu.com
2729
 30+# NTP
 31+d-i clock-setup/ntp-server string ntp.knams.wikimedia.org
 32+
2833 # ssmtp settings
2934 ssmtp ssmtp/mailhub string pascal.knams.wikimedia.org
3035 ssmtp ssmtp/fromoverride boolean true
Index: trunk/ubuntu/autoinstall/yaseo.cfg
@@ -10,8 +10,9 @@
1111 d-i netcfg/get_nameservers string 203.212.189.251 208.80.152.131
1212 d-i netcfg/confirm_static boolean true
1313
14 -d-i netcfg/get_hostname string unassigned-hostname
15 -d-i netcfg/get_domain string unassigned-domain
 14+# get_domain should be set, get_hostname is overwritten by DHCP
 15+#d-i netcfg/get_hostname string unassigned-hostname
 16+d-i netcfg/get_domain string yaseo.wikimedia.org
1617 d-i netcfg/wireless_wep string
1718
1819 ### Mirror settings
@@ -22,6 +23,9 @@
2324
2425 d-i apt-setup/security_host string security.ubuntu.com
2526
 27+# NTP
 28+d-i clock-setup/ntp-server string ntp.yaseo.wikimedia.org
 29+
2630 # ssmtp settings
2731 ssmtp ssmtp/mailhub string smtp.yaseo.wikimedia.org
2832 ssmtp ssmtp/fromoverride boolean true