X-Git-Url: https://git.hcoop.net/hcoop/zz_old/machine-template.git/blobdiff_plain/034ea92a6c35404e487f968652b2052998028555..5db83306cdb92e43c4359b25f8633eb26a34fc1e:/preseed/preseed-wheezy.cfg

diff --git a/preseed/preseed-wheezy.cfg b/preseed/preseed-wheezy.cfg
index fb38d31..552b950 100644
--- a/preseed/preseed-wheezy.cfg
+++ b/preseed/preseed-wheezy.cfg
@@ -84,7 +84,7 @@ d-i mirror/http/directory string /debian
 d-i mirror/http/proxy string
 
 # Suite to install.
-d-i mirror/suite string squeeze
+d-i mirror/suite string wheezy
 # Suite to use for loading installer components (optional).
 #d-i mirror/udeb/suite string testing
 
@@ -221,7 +221,7 @@ hcoop-default :: \
 	filesystem{ ext3 } \
 	mountpoint{ /var/cache/openafs } . \
  \
-96 512 150% linux-swap \
+1024 512 1024 linux-swap \
 	$lvmok{ } \
 	method{ swap } \
 	format{ } . \
@@ -315,7 +315,7 @@ d-i partman/confirm_nooverwrite boolean true
 
 # The kernel image (meta) package to be installed; "none" can be used if no
 # kernel is to be installed.
-d-i base-installer/kernel/image string linux-image-2.6-amd64
+d-i base-installer/kernel/image string linux-image-amd64
 
 ### Apt setup
 # You can choose to install non-free and contrib software.
@@ -331,23 +331,24 @@ d-i apt-setup/volatile_host string volatile.debian.org
 
 # Additional repositories, local[0-9] available
 d-i apt-setup/local0/repository string \
-       http://debian.hcoop.net/ stable main hcoop-config
+       http://debian.hcoop.net/ wheezy main hcoop-config
 d-i apt-setup/local0/comment string HCoop native packages
 # Enable deb-src lines
 d-i apt-setup/local0/source boolean true
 # backports
 d-i apt-setup/local1/repository string \
-       http://debian.hcoop.net/ squeeze-backports main
+       http://debian.hcoop.net/ wheezy-backports main
 d-i apt-setup/local1/comment string HCoop backport packages
 # Enable deb-src lines
 d-i apt-setup/local1/source boolean true
 # Official backports
 d-i apt-setup/local2/repository string \
-       http://backports.debian.org/debian-backports squeeze-backports main
+       http://http.us.debian.org/debian wheezy-backports main
 d-i apt-setup/local2/comment string Debian backports
 # Enable deb-src lines
 d-i apt-setup/local2/source boolean true
 
+
 # URL to the public key of the local repository; you must provide a key or
 # apt will complain about the unauthenticated repository and so the
 # sources.list line will be left commented out
@@ -366,8 +367,9 @@ tasksel	tasksel/first	multiselect	SSH server, Standard system utilities
 #tasksel tasksel/desktop multiselect kde, xfce
 
 # Individual additional packages to install
-d-i pkgsel/include string build-essential less sudo vim emacs23-nox etckeeper changetrack openssh-server debsums logcheck bzip2 denyhosts rkhunter openafs-client ntp nscd krb5-user libpam-krb5 kstart ssmtp libpam-afs-session openafs-krb5 ferm libnss-afs hcoop-nsswitch-config hcoop-common-config hcoop-firewall-config hcoop-krb5-config hcoop-openssh-server-config \
-    mlton-compiler mlton-tools libssl-dev libpcre3-dev # domtool deps, a metapackage would be useful here
+d-i pkgsel/include string build-essential less sudo vim emacs23-nox etckeeper changetrack openssh-server debsums logcheck bzip2 denyhosts rkhunter openafs-client/wheezy-backports openafs-modules-dkms/wheezy-backports ntp nscd krb5-user libpam-krb5 kstart ssmtp libpam-afs-session openafs-krb5/wheezy-backports resolvconf dnscache-run/wheezy-backports runit ferm libnss-afs hcoop-nsswitch-config hcoop-common-config hcoop-firewall-config hcoop-krb5-config hcoop-openssh-server-config \
+    mlton-compiler mlton-tools libssl-dev libpcre3-dev \ # domtool deps, a metapackage would be useful here
+    linux-headers-amd64/wheezy # backports afs-dkms package causes this to not automatically install. Not sure if /wheezy is really needed.
 # Whether to upgrade packages after debootstrap.
 # Allowed values: none, safe-upgrade, full-upgrade
 d-i pkgsel/upgrade select safe-upgrade
@@ -429,6 +431,7 @@ krb5-config	krb5-config/admin_server	string	kerberos-adm.hcoop.net
 ssmtp	ssmtp/root	string	logs
 ssmtp	ssmtp/rewritedomain	string	hcoop.net
 ssmtp	ssmtp/mailhub	string	mail
+ssmtp	ssmtp/fromoverride	boolean	true
 
 rkhunter	rkhunter/cron_daily_run	boolean	true
 rkhunter	rkhunter/cron_db_update	boolean	true