Update location of init.sh script

Update package lists

8 files changed, 223 insertions, 16 deletions

diff --git a/autoinstall/beefymiracle-30.cfg b/autoinstall/beefymiracle-30.cfg
index bc1a2f7..2458843 100644
--- a/autoinstall/beefymiracle-30.cfg
+++ b/autoinstall/beefymiracle-30.cfg
@@ -23,14 +23,62 @@ repo --name=kolab-3.0-development --baseurl=http://mirror.kolabsys.com/pub/fedor
 repo --name=updates --baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/17/x86_64/
 
 %packages
+#%packages --ignoremissing
 kolab-3.0-community-release
 kolab-3.0-community-release-development
+epel-release
 NetworkManager
 kolab
 
+# Allow LDAP to be used with PAM
+nscd
+nss-pam-ldapd
+pam_ldap
+
 # For development purposes
 git
+vim-enhanced
+
+# Build requirements for pykolab
+automake
+autoconf
+gcc
+gettext
+glib2-devel
+intltool
+python
+python-icalendar
+python-kolabformat
+python-ldap
+python-nose
+
+# Build utilities
+@fedora-packager
+
+# Other build dependencies
+binutils-devel
+boost-devel
+cmake
+cyrus-sasl-devel
+e2fsprogs-devel
+gcc-c++
+js-devel
+libcalendaring-devel
+libcurl-devel
+libical-devel
+libkolabxml-devel
+llvm-devel
+php-devel
+python-devel
+qt-devel
+swig
+uuid-devel
+v8-devel
+xerces-c-devel
+xsd
 
+# Development tools
+php-pecl-xdebug
 %end
 
 %post
diff --git a/autoinstall/quantal-30.cfg b/autoinstall/quantal-30.cfg
index 9f23af8..84e2a26 100644
--- a/autoinstall/quantal-30.cfg
+++ b/autoinstall/quantal-30.cfg
@@ -34,10 +34,10 @@ d-i apt-setup/non-free boolean true
 d-i apt-setup/contrib boolean true
 
 tasksel tasksel/first multiselect standard
-d-i pkgsel/include select build-essential cowbuilder debhelper devscripts dh-make dh-autoreconf fakeroot git-buildpackage kde-standard kontact ldapscripts lintian openssh-server pbuilder sudo vim wget
+d-i pkgsel/include select openssh-server sysv-rc-conf wget
 d-i popularity-contest/participate boolean false
 
-d-i preseed/late_command string in-target wget -q -O/root/init.sh http://hosted.kolabsys.com/~vanmeeuwen/bootstrap-quantal-script.txt; in-target chmod +x /root/init.sh; in-target bash /root/init.sh
+d-i preseed/late_command string in-target wget -q -O/root/init.sh http://git.kolab.org/kolab-scripts/plain/autoinstall/bootstrap/bootstrap-quantal-script.txt; in-target chmod +x /root/init.sh; in-target bash /root/init.sh
 
 d-i grub-installer/only_debian boolean true
 d-i grub-installer/with_other_os boolean true
diff --git a/autoinstall/rawhide-30.cfg b/autoinstall/rawhide-30.cfg
index 0c129d0..87ac458 100644
--- a/autoinstall/rawhide-30.cfg
+++ b/autoinstall/rawhide-30.cfg
@@ -20,9 +20,62 @@ repo --name=rawhide --baseurl=http://mirror.kolabsys.com/distr/fedora/developmen
 reboot
 
 %packages
+#%packages --ignoremissing
+kolab-3.0-community-release
+kolab-3.0-community-release-development
+epel-release
 NetworkManager
-@gnome-desktop
-@kde-desktop
+kolab
+
+# Allow LDAP to be used with PAM
+nscd
+nss-pam-ldapd
+pam_ldap
+
+# For development purposes
+git
+vim-enhanced
+
+# Build requirements for pykolab
+automake
+autoconf
+gcc
+gettext
+glib2-devel
+intltool
+python
+python-icalendar
+python-kolabformat
+python-ldap
+python-nose
+
+# Build utilities
+@fedora-packager
+
+# Other build dependencies
+binutils-devel
+boost-devel
+cmake
+cyrus-sasl-devel
+e2fsprogs-devel
+gcc-c++
+js-devel
+libcalendaring-devel
+libcurl-devel
+libical-devel
+libkolabxml-devel
+llvm-devel
+php-devel
+python-devel
+qt-devel
+swig
+uuid-devel
+v8-devel
+xerces-c-devel
+xsd
+
+# Development tools
+php-pecl-xdebug
 %end
 
 %post
diff --git a/autoinstall/santiago-24.cfg b/autoinstall/santiago-24.cfg
index 645ad4e..ec5af25 100644
--- a/autoinstall/santiago-24.cfg
+++ b/autoinstall/santiago-24.cfg
@@ -20,17 +20,70 @@ network --hostname=kolab.example.org
 reboot
 
 repo --name=epel --baseurl=http://download.fedoraproject.org/pub/epel/6/x86_64/
+repo --name=updates --baseurl=http://ftp.nluug.nl/pub/os/Linux/distr/CentOS/6/updates/x86_64/
 repo --name=kolab-2.4 --baseurl=http://mirror.kolabsys.com/pub/redhat/kolab-2.4/el6/release/x86_64/
 repo --name=kolab-2.4-updates --baseurl=http://mirror.kolabsys.com/pub/redhat/kolab-2.4/el6/updates/x86_64/
-repo --name=kolab-2.4-development-koji --baseurl=http://koji.kolabsys.com/static-repos/feature-el6-kolab-2.4-development-build/latest/x86_64/
+repo --name=kolab-2.4-development --baseurl=http://mirror.kolabsys.com/pub/redhat/kolab-2.4/el6/development/x86_64/
 
 %packages
-NetworkManager
+#%packages --ignoremissing
 kolab-2.4-community-release
 kolab-2.4-community-release-development
 epel-release
+NetworkManager
 kolab
 
+# Allow LDAP to be used with PAM
+nscd
+nss-pam-ldapd
+pam_ldap
+
+# For development purposes
+git
+vim-enhanced
+
+# Build requirements for pykolab
+automake
+autoconf
+gcc
+gettext
+glib2-devel
+intltool
+python
+python-icalendar
+python-kolabformat
+python-ldap
+python-nose
+
+# Build utilities
+@fedora-packager
+
+# Other build dependencies
+binutils-devel
+boost-devel
+cmake
+cyrus-sasl-devel
+e2fsprogs-devel
+gcc-c++
+js-devel
+libcalendaring-devel
+libcurl-devel
+libical-devel
+libkolabxml-devel
+llvm-devel
+php-devel
+python-devel
+qt-devel
+swig
+uuid-devel
+v8-devel
+xerces-c-devel
+xsd
+
+# Development tools
+php-pecl-xdebug
+%end
+
 %post
 # Set the default runlevel to 3
 # https://bugzilla.redhat.com/show_bug.cgi?id=440058
diff --git a/autoinstall/santiago-30.cfg b/autoinstall/santiago-30.cfg
index 1bb126e..800cb6e 100644
--- a/autoinstall/santiago-30.cfg
+++ b/autoinstall/santiago-30.cfg
@@ -18,14 +18,11 @@ network --hostname=kolab.example.org
 
 reboot
 
-# repo --name=kolab-3.0 --baseurl=http://koji.kolabsys.com/static-repos/feature-el6-kolab-3.0-development-build/latest/x86_64/
-# repo --name=el6-updates-uk --baseurl=http://mirror.bytemark.co.uk/centos/6/updates/x86_64/
+repo --name=epel --baseurl=http://ftp.nluug.nl/os/Linux/distr/fedora-epel/6/x86_64/
 repo --name=updates --baseurl=http://ftp.nluug.nl/pub/os/Linux/distr/CentOS/6/updates/x86_64/
 repo --name=kolab-3.0-release --baseurl=http://mirror.kolabsys.com/pub/redhat/kolab-3.0/el6/release/x86_64/
 repo --name=kolab-3.0-updates --baseurl=http://mirror.kolabsys.com/pub/redhat/kolab-3.0/el6/updates/x86_64/
 repo --name=kolab-3.0-development --baseurl=http://mirror.kolabsys.com/pub/redhat/kolab-3.0/el6/development/x86_64/
-# repo --name=epel --baseurl=http://mirror.bytemark.co.uk/fedora/epel/6/x86_64/
-repo --name=epel --baseurl=http://ftp.nluug.nl/os/Linux/distr/fedora-epel/6/x86_64/
 
 %packages
 #%packages --ignoremissing
@@ -35,6 +32,11 @@ epel-release
 NetworkManager
 kolab
 
+# Allow LDAP to be used with PAM
+nscd
+nss-pam-ldapd
+pam_ldap
+
 # For development purposes
 git
 vim-enhanced
@@ -79,6 +81,7 @@ xsd
 
 # Development tools
 php-pecl-xdebug
+%end
 
 %post
 # Set the default runlevel to 3
diff --git a/autoinstall/sid-30.cfg b/autoinstall/sid-30.cfg
index 2d1d934..d6ff5d2 100644
--- a/autoinstall/sid-30.cfg
+++ b/autoinstall/sid-30.cfg
@@ -5,8 +5,8 @@ d-i netcfg/get_hostname kolab.example.org
 d-i netcfg/get_domain kolab.example.org
 d-i netcfg/wireless_wep string
 d-i mirror/country string enter information manually
-d-i mirror/http/hostname string mirror.kolabsys.com
-d-i mirror/http/directory string /distr/debian/
+d-i mirror/http/hostname string ftp.uk.debian.org
+d-i mirror/http/directory string /debian/
 d-i clock-setup/utc boolean true
 d-i time/zone string Europe/Zurich
 d-i clock-setup/ntp boolean true
@@ -34,12 +34,12 @@ d-i apt-setup/non-free boolean true
 d-i apt-setup/contrib boolean true
 
 tasksel tasksel/first multiselect standard
-d-i pkgsel/include select openssh-server,vim,git,util-linux
+d-i pkgsel/include select openssh-server sysv-rc-conf wget
 d-i popularity-contest/participate boolean false
 
 d-i grub-installer/only_debian boolean true
 d-i grub-installer/with_other_os boolean true
 
-d-i debian-installer/add-kernel-opts string console=ttyS0,9600n8
+d-i preseed/late_command string in-target wget -q -O/root/init.sh http://git.kolab.org/kolab-scripts/plain/autoinstall/bootstrap/bootstrap-wheezy-script.txt; in-target chmod +x /root/init.sh; in-target bash /root/init.sh
 
 d-i finish-install/reboot_in_progress note
diff --git a/autoinstall/sphericalcow-30.cfg b/autoinstall/sphericalcow-30.cfg
index 67a1d90..02c51a7 100644
--- a/autoinstall/sphericalcow-30.cfg
+++ b/autoinstall/sphericalcow-30.cfg
@@ -17,11 +17,61 @@ network --hostname=kolab.example.org
 reboot
 
 %packages
+kolab-3.0-community-release
+kolab-3.0-community-release-development
+epel-release
 NetworkManager
+kolab
+
+# Allow LDAP to be used with PAM
+nscd
+nss-pam-ldapd
+pam_ldap
 
 # For development purposes
 git
+vim-enhanced
+
+# Build requirements for pykolab
+automake
+autoconf
+gcc
+gettext
+glib2-devel
+intltool
+python
+python-icalendar
+python-kolabformat
+python-ldap
+python-nose
+
+# Build utilities
+@fedora-packager
+
+# Other build dependencies
+binutils-devel
+boost-devel
+cmake
+cyrus-sasl-devel
+e2fsprogs-devel
+gcc-c++
+js-devel
+libcalendaring-devel
+libcurl-devel
+libical-devel
+libkolabxml-devel
+llvm-devel
+php-devel
+python-devel
+qt-devel
+swig
+uuid-devel
+v8-devel
+xerces-c-devel
+xsd
 
+# Development tools
+php-pecl-xdebug
 %end
 
 %post
diff --git a/autoinstall/wheezy-30.cfg b/autoinstall/wheezy-30.cfg
index 66bcd04..d6ff5d2 100644
--- a/autoinstall/wheezy-30.cfg
+++ b/autoinstall/wheezy-30.cfg
@@ -34,12 +34,12 @@ d-i apt-setup/non-free boolean true
 d-i apt-setup/contrib boolean true
 
 tasksel tasksel/first multiselect standard
-d-i pkgsel/include select build-essential cowbuilder debhelper devscripts dh-make dh-autoreconf fakeroot git-buildpackage ldapscripts lintian openssh-server pbuilder sudo vim wget
+d-i pkgsel/include select openssh-server sysv-rc-conf wget
 d-i popularity-contest/participate boolean false
 
 d-i grub-installer/only_debian boolean true
 d-i grub-installer/with_other_os boolean true
 
-d-i preseed/late_command string in-target wget -q -O/root/init.sh http://hosted.kolabsys.com/~vanmeeuwen/bootstrap-wheezy-script.txt; in-target chmod +x /root/init.sh; in-target bash /root/init.sh
+d-i preseed/late_command string in-target wget -q -O/root/init.sh http://git.kolab.org/kolab-scripts/plain/autoinstall/bootstrap/bootstrap-wheezy-script.txt; in-target chmod +x /root/init.sh; in-target bash /root/init.sh
 
 d-i finish-install/reboot_in_progress note