http://www.mediawiki.org/wiki/Special:Code/MediaWiki/59592
Revision: 59592
Author: root
Date: 2009-11-30 18:37:30 +0000 (Mon, 30 Nov 2009)
Log Message:
-----------
* Rename knams into esams
* As root, just to annoy Roan
Modified Paths:
--------------
trunk/ubuntu/autoinstall/netboot.cfg
Added Paths:
-----------
trunk/ubuntu/autoinstall/esams.cfg
Removed Paths:
-------------
trunk/ubuntu/autoinstall/knams.cfg
Copied: trunk/ubuntu/autoinstall/esams.cfg (from rev 59579,
trunk/ubuntu/autoinstall/knams.cfg)
===================================================================
--- trunk/ubuntu/autoinstall/esams.cfg (rev 0)
+++ trunk/ubuntu/autoinstall/esams.cfg 2009-11-30 18:37:30 UTC (rev 59592)
@@ -0,0 +1,34 @@
+# esams specific configuration settings
+
+# Select interface that has a link
+d-i netcfg/choose_interface select auto
+
+d-i netcfg/disable_dhcp boolean true
+# ip address is taken from DHCP, rest is set here
+d-i netcfg/get_domain string esams.wikimedia.org
+d-i netcfg/get_netmask string 255.255.255.128
+d-i netcfg/get_gateway string 91.198.174.1
+d-i netcfg/get_nameservers string 91.198.174.6 208.80.152.131
+d-i netcfg/confirm_static boolean true
+
+# get_domain should be set, get_hostname is overwritten by DHCP
+#d-i netcfg/get_hostname string unassigned-hostname
+d-i netcfg/get_domain string esams.wikimedia.org
+
+d-i netcfg/wireless_wep string
+
+### Mirror settings
+d-i mirror/country select NL
+d-i mirror/http/countries select NL
+d-i mirror/http/mirror select nl.archive.ubuntu.com
+d-i mirror/http/directory string /ubuntu/
+d-i mirror/http/proxy string
+
+d-i apt-setup/security_host string security.ubuntu.com
+
+# NTP
+d-i clock-setup/ntp-server string ntp.esams.wikimedia.org
+
+# ssmtp settings
+ssmtp ssmtp/mailhub string pascal.esams.wikimedia.org
+ssmtp ssmtp/fromoverride boolean true
Deleted: trunk/ubuntu/autoinstall/knams.cfg
===================================================================
--- trunk/ubuntu/autoinstall/knams.cfg 2009-11-30 18:31:57 UTC (rev 59591)
+++ trunk/ubuntu/autoinstall/knams.cfg 2009-11-30 18:37:30 UTC (rev 59592)
@@ -1,34 +0,0 @@
-# knams specific configuration settings
-
-# Select interface that has a link
-d-i netcfg/choose_interface select auto
-
-d-i netcfg/disable_dhcp boolean true
-# ip address is taken from DHCP, rest is set here
-d-i netcfg/get_domain string knams.wikimedia.org
-d-i netcfg/get_netmask string 255.255.255.128
-d-i netcfg/get_gateway string 91.198.174.1
-d-i netcfg/get_nameservers string 91.198.174.6 208.80.152.131
-d-i netcfg/confirm_static boolean true
-
-# get_domain should be set, get_hostname is overwritten by DHCP
-#d-i netcfg/get_hostname string unassigned-hostname
-d-i netcfg/get_domain string knams.wikimedia.org
-
-d-i netcfg/wireless_wep string
-
-### Mirror settings
-d-i mirror/country select NL
-d-i mirror/http/countries select NL
-d-i mirror/http/mirror select nl.archive.ubuntu.com
-d-i mirror/http/directory string /ubuntu/
-d-i mirror/http/proxy string
-
-d-i apt-setup/security_host string security.ubuntu.com
-
-# NTP
-d-i clock-setup/ntp-server string ntp.knams.wikimedia.org
-
-# ssmtp settings
-ssmtp ssmtp/mailhub string pascal.knams.wikimedia.org
-ssmtp ssmtp/fromoverride boolean true
Modified: trunk/ubuntu/autoinstall/netboot.cfg
===================================================================
--- trunk/ubuntu/autoinstall/netboot.cfg 2009-11-30 18:31:57 UTC (rev
59591)
+++ trunk/ubuntu/autoinstall/netboot.cfg 2009-11-30 18:37:30 UTC (rev
59592)
@@ -3,5 +3,5 @@
# Generally we'll do a basic server install.
d-i preseed/include string common.cfg passwd.cfg override.cfg
-d-i preseed/include_command string case $(ip address show dev eth0 | egrep
'^[[:space:]]+inet' | cut -d ' ' -f 8) in 208.80.152.191) echo pmtpa.cfg ;;
208.80.152.127) echo pmtpa-squid.cfg ;; 10.0.255.255) echo pmtpa-internal.cfg
;; 91.198.174.127) echo knams.cfg ;; esac; case $(debconf-get
netcfg/get_hostname) in sq*|knsq*) echo squid.cfg ;; db*) echo db.cfg ;;
srv15[123]) echo apache.cfg ;; esac
+d-i preseed/include_command string case $(ip address show dev eth0 | egrep
'^[[:space:]]+inet' | cut -d ' ' -f 8) in 208.80.152.191) echo pmtpa.cfg ;;
208.80.152.127) echo pmtpa-squid.cfg ;; 10.0.255.255) echo pmtpa-internal.cfg
;; 91.198.174.127) echo esams.cfg ;; esac; case $(debconf-get
netcfg/get_hostname) in sq*|knsq*) echo squid.cfg ;; db*) echo db.cfg ;;
srv15[123]) echo apache.cfg ;; esac
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
