[enh] Update default amd64 profile to Debian Jessie

README.md

@@ -5,8 +5,7 @@ CD Build tools
 Requirements
 ------------
 
-* Debian Wheezy
+* Debian Jessie 
-* A sudoer
 
 
 Installation
@@ -14,14 +13,28 @@ Installation
 ```
 git clone git://github.com/YunoHost/cd_build.git
 cd cd_build
-sudo dpkg -i ./simple-cdd_0.3.14_all.deb
+sudo apt-get install -f simple-cdd enisoimage qemu-kvm
-sudo apt-get install -f genisoimage qemu-kvm
 ```
 
-Some problems can occur at `dpkg -i` but keep going !
+Build an image
+---------------
+```
+build-simple-cdd --conf ./simple-cdd-amd64.conf
+```
 
 
-Usage
+Troubleshooting
+---------------
+
+If you got errors for mysql-password debconf, temporaly change rights on /var/cache/debconf/passwords.dat
+
+This file doesn't contain password.
+
+```
+sudo chmod o+r /var/cache/debconf/passwords.dat
+```
+
+Old how to
 -----
 ```
 ./build-yunohost amd64
@@ -32,12 +45,3 @@ Or
 ```
 ./build-yunohost i386
 ```
-
-
-Troubleshooting
----------------
-
-If you got errors for mysql-password debconf, temporaly change rights on /var/cache/debconf/passwords.dat
-```
-sudo chmod 666 /var/cache/debconf/passwords.dat
-```

add-firmware-to

@@ -77,7 +77,7 @@ initrd_append_fw() {
     cd -
     gzip -9 < "$initrdtmp/initrd" > "$outfile"
 
-    rm -rf "$initrdtmp"
+    #rm -rf "$initrdtmp"
 }
 
 
@@ -153,7 +153,7 @@ if is_iso "$file"; then
     genisoimage -r -J -b "$isolinuxpath" -c boot.cat \
                 -no-emul-boot -boot-load-size 4 -boot-info-table \
                 -o "$outfile" "$buildtree"
-    rm -rf "$isotmp"
+    #rm -rf "$isotmp"
 fi
 
 if is_initrd "$file"; then

build-yunohost

@@ -1,31 +1,33 @@
 #!/bin/bash
 
 DATE=$(date +%m%d%y%H%M)
+DIST='jessie'
+DEBNUM='8.0'
 
 function build-i386
 {
-build-simple-cdd --dist wheezy --force-preseed --conf ./simple-cdd-i386.conf
+build-simple-cdd --dist $DIST --force-preseed --conf ./simple-cdd-i386.conf
-$(pwd)/add-firmware-to images/debian-7.0-i386-CD-1.iso images/yunohostv2-$DATE-i386.iso wheezy
+$(pwd)/add-firmware-to images/debian-$DEBNUM-i386-CD-1.iso images/yunohostv2-$DATE-i386.iso $DIST
-rm images/debian-7.0-i386-CD-1.iso
+rm images/debian-$DEBNUM-i386-CD-1.iso
-rm images/debian-7.0-i386-CD-1.list.gz
+rm images/debian-$DEBNUM-i386-CD-1.list.gz
 }
 
 function build-amd64
 {
-build-simple-cdd --dist wheezy --force-preseed --conf ./simple-cdd-amd64.conf
+build-simple-cdd --dist $DIST --force-preseed --conf ./simple-cdd-amd64.conf
-$(pwd)/add-firmware-to images/debian-7.0-amd64-CD-1.iso images/yunohostv2-$DATE-amd64.iso wheezy
+$(pwd)/add-firmware-to images/debian-$DEBNUM-amd64-CD-1.iso images/yunohostv2-$DATE-amd64.iso $DIST
-rm images/debian-7.0-amd64-CD-1.iso
+#rm images/debian-$DEBNUM-amd64-CD-1.iso
-rm images/debian-7.0-amd64-CD-1.list.gz
+#rm images/debian-$DEBNUM-amd64-CD-1.list.gz
 }
 
 function build-amd64-test
 {
 cp profiles/default.preseed profiles/old.default.preseed
 cp profiles/test.preseed profiles/default.preseed
-build-simple-cdd --dist wheezy --force-preseed --conf ./simple-cdd-amd64.conf
+build-simple-cdd --dist $DIST --force-preseed --conf ./simple-cdd-amd64.conf
-$(pwd)/add-firmware-to images/debian-7.0-amd64-CD-1.iso images/yunohostv2-$DATE-amd64-test.iso wheezy
+$(pwd)/add-firmware-to images/debian-$DEBNUM-amd64-CD-1.iso images/yunohostv2-$DATE-amd64-test.iso $DIST
-rm images/debian-7.0-amd64-CD-1.iso
+rm images/debian-$DEBNUM-amd64-CD-1.iso
-rm images/debian-7.0-amd64-CD-1.list.gz
+rm images/debian-$DEBNUM-amd64-CD-1.list.gz
 mv profiles/old.default.preseed profiles/default.preseed
 }
 

profiles/advanced.preseed

@@ -1,4 +1,4 @@
-d-i netcfg/use_dhcp false
+d-i netcfg/use_dhcp boolean false
 d-i netcfg/choose_interface select auto
 d-i netcfg/disable_dhcp boolean true
 d-i netcfg/dhcp_failed note
@@ -23,7 +23,7 @@ d-i apt-setup/local0/repository string \
 d-i apt-setup/local0/key string http://repo.yunohost.org/yunohost.asc
 d-i debian-installer/allow_unauthenticated string true
 tasksel tasksel/first multiselect standard, web-server, ssh-server
-d-i pkgsel/include postfix yunohost
+d-i pkgsel/include string postfix yunohost
 popularity-contest popularity-contest/participate boolean false
 debconf debconf/frontend select Noninteractive
 d-i grub-installer/only_debian boolean true
@@ -31,23 +31,23 @@ d-i grub-installer/with_other_os boolean true
 d-i finish-install/reboot_in_progress note
 d-i cdrom-detect/eject boolean true
 d-i debian-installer/exit/reboot boolean true
-slapd slapd/domain string yunohost.org
-slapd shared/organization string yunohost
 slapd slapd/password1 password yunohost
 slapd slapd/password2 password yunohost
-postfix	postfix/main_mailer_type	select	Internet Site
+slapd slapd/domain string yunohost.org
+slapd shared/organization string yunohost.org
+slapd slapd/allow_ldap_v2 boolean false
+slapd slapd/invalid_config boolean true
+slapd slapd/backend select MDB
+postfix postfix/main_mailer_type select Internet Site
 postfix postfix/mailname string /etc/mailname
 mysql-server-5.5 mysql-server/root_password password yunohost
 mysql-server-5.5 mysql-server/root_password_again password yunohost
-samba-common samba-common/workgroup string WORKGROUP
+mariadb-server-10.0 mysql-server/root_password password yunohost
-samba-common samba-common/workgroup boolean true
+mariadb-server-10.0 mysql-server/root_password_again password yunohost
-nslcd	nslcd/ldap-bindpw	password	
+nslcd nslcd/ldap-bindpw password
-nslcd	nslcd/ldap-starttls	boolean	false
+nslc nslcd/ldap-starttls boolean false
-nslcd	nslcd/ldap-reqcert	select	
+nslcd nslcd/ldap-reqcert select
-nslcd	nslcd/ldap-uris	string	ldap://localhost/
+nslcd nslcd/ldap-uris string ldap://localhost/
-nslcd	nslcd/ldap-binddn	string
+nslcd nslcd/ldap-binddn string
-nslcd   nslcd/ldap-base  	string dc=yunohost,dc=org
+nslcd nslcd/ldap-base string dc=yunohost,dc=org
-proftpd-basic	shared/proftpd/inetd_or_standalone	select standalone
+libnss-ldapd libnss-ldapd/nsswitch multiselect group, passwd, shadow
-iptables-persistent     iptables-persistent/autosave_v6 boolean false
-iptables-persistent     iptables-persistent/autosave_v4 boolean false
-libnss-ldapd	libnss-ldapd/nsswitch multiselect group, passwd, shadow

profiles/default.base_include

@@ -1,39 +0,0 @@
-# keep grub or debian-installer may not work properly.
-grub
-
-popularity-contest
-localization-config
-console-tools
-
-usbutils
-acpi
-acpid
-eject
-
-# needed for debian-installer's LVM, software RAID or encrypted disks:
-lvm2
-mdadm
-cryptsetup
-
-# to support reiserfs, JFS and XFS filesystems
-reiserfsprogs
-jfsutils
-xfsprogs
-
-# type-handling tiny package needed for xorg on most architectures
-type-handling
-
-# debian-cd uses debootstrap from the mirror
-debootstrap
-
-# initramfs-tools recommends busybox, and we don't yet support recommends
-busybox
-
-# newer debian-cd (0.3.5+) requires syslinux-common or syslinux in the mirror
-syslinux-common
-syslinux
-
-# add non-free firmware
-firmware-linux-nonfree
-file
-libc6-i386

profiles/default.downloads

@@ -1,39 +0,0 @@
-# keep grub or debian-installer may not work properly.
-grub
-
-popularity-contest
-localization-config
-console-tools
-
-usbutils
-acpi
-acpid
-eject
-
-# needed for debian-installer's LVM, software RAID or encrypted disks:
-lvm2
-mdadm
-cryptsetup
-
-# to support reiserfs, JFS and XFS filesystems
-reiserfsprogs
-jfsutils
-xfsprogs
-
-# type-handling tiny package needed for xorg on most architectures
-type-handling
-
-# debian-cd uses debootstrap from the mirror
-debootstrap
-
-# initramfs-tools recommends busybox, and we don't yet support recommends
-busybox
-
-# newer debian-cd (0.3.5+) requires syslinux-common or syslinux in the mirror
-syslinux-common
-syslinux
-
-# add non-free firmware
-firmware-linux-nonfree
-file
-libc6-i386

profiles/default.packages

@@ -1,4 +0,0 @@
-# less is more intuituve
-less
-simple-cdd-profiles
-firmware-linux-nonfree

profiles/default.preseed

@@ -1,3 +1,4 @@
+### Network configuration
 d-i netcfg/choose_interface select auto
 d-i netcfg/dhcp_failed note
 d-i netcfg/dhcp_options select Configure network manually
@@ -5,14 +6,20 @@ d-i netcfg/disable_dhcp boolean false
 d-i netcfg/get_hostname string yunohost
 d-i netcfg/get_domain string yunohost.org
 d-i netcfg/get_domain seen true
+
+### Mirror settings
 d-i mirror/country string manual
 d-i mirror/http/hostname string ftp.debian.org
 d-i mirror/http/directory string /debian
 d-i mirror/http/proxy string
+
+### Clock and time zone setup
 d-i clock-setup/utc boolean true
 d-i time/zone string Europe/Paris
 d-i clock-setup/ntp boolean true
 d-i clock-setup/ntp-server string 0.fr.pool.ntp.org
+
+### Partitioning
 d-i partman-auto/method string regular
 d-i partman-auto/choose_recipe select multi
 #d-i partman-auto/expert_recipe string                           \
@@ -35,40 +42,55 @@ d-i partman/confirm_write_new_label boolean true
 d-i partman/choose_partition select finish
 d-i partman/confirm boolean false
 d-i partman/confirm_nooverwrite boolean true
+
+### Account setup
 d-i passwd/root-password-crypted password $1$6xBdkGvE$8nLCNRxwABespdFJniEiX0
-d-i passwd/make-user boolean fasle
+d-i passwd/make-user boolean false
+
+### Base system installation
 d-i apt-setup/non-free boolean true
 d-i apt-setup/contrib boolean true
 d-i apt-setup/local0/repository string \
-	http://repo.yunohost.org/ megusta main
+	http://repo.yunohost.org/debian/ jessie stable
 d-i apt-setup/local0/key string http://repo.yunohost.org/yunohost.asc
 d-i debian-installer/allow_unauthenticated string true
+
+### Package selection
 tasksel tasksel/first multiselect standard, web-server, ssh-server
-d-i pkgsel/include postfix yunohost
+d-i pkgsel/include string postfix yunohost yunohost-admin
+
+### Deactivate poll on popular packages
 popularity-contest popularity-contest/participate boolean false
+
 debconf debconf/frontend select Noninteractive
+
+### Boot loader installation
 d-i grub-installer/only_debian boolean true
 d-i grub-installer/with_other_os boolean true
+
+### Finishing up the installation
 d-i finish-install/reboot_in_progress note
 d-i cdrom-detect/eject boolean true
 d-i debian-installer/exit/reboot boolean true
-slapd slapd/domain string yunohost.org
+
-slapd shared/organization string yunohost
+### YunoHost Debconf (same than in yunohost/install_script)
 slapd slapd/password1 password yunohost
 slapd slapd/password2 password yunohost
-postfix	postfix/main_mailer_type	select Internet Site
+slapd slapd/domain string yunohost.org
+slapd shared/organization string yunohost.org
+slapd slapd/allow_ldap_v2 boolean false
+slapd slapd/invalid_config boolean true
+slapd slapd/backend select MDB
+postfix postfix/main_mailer_type select Internet Site
 postfix postfix/mailname string /etc/mailname
 mysql-server-5.5 mysql-server/root_password password yunohost
 mysql-server-5.5 mysql-server/root_password_again password yunohost
-samba-common samba-common/workgroup string WORKGROUP
+mariadb-server-10.0 mysql-server/root_password password yunohost
-samba-common samba-common/workgroup boolean true
+mariadb-server-10.0 mysql-server/root_password_again password yunohost
-nslcd	nslcd/ldap-bindpw	password	
+nslcd nslcd/ldap-bindpw password
-nslcd	nslcd/ldap-starttls	boolean	false
+nslc nslcd/ldap-starttls boolean false
-nslcd	nslcd/ldap-reqcert	select	
+nslcd nslcd/ldap-reqcert select
-nslcd	nslcd/ldap-uris	string	ldap://localhost/
+nslcd nslcd/ldap-uris string ldap://localhost/
-nslcd	nslcd/ldap-binddn	string
+nslcd nslcd/ldap-binddn string
-nslcd   nslcd/ldap-base  	string dc=yunohost,dc=org
+nslcd nslcd/ldap-base string dc=yunohost,dc=org
-proftpd-basic	shared/proftpd/inetd_or_standalone	select standalone
+libnss-ldapd libnss-ldapd/nsswitch multiselect group, passwd, shadow
-iptables-persistent     iptables-persistent/autosave_v6 boolean false
-iptables-persistent     iptables-persistent/autosave_v4 boolean false
-libnss-ldapd	libnss-ldapd/nsswitch multiselect group, passwd, shadow

profiles/default.udebs

@@ -1,2 +0,0 @@
-# the udeb needed for simple-cdd
-simple-cdd-profiles

simple-cdd-amd64.conf

@@ -1,12 +1,11 @@
-server="ftp.fr.debian.org"
+server="ftp2.fr.debian.org"
-debian_mirror="ftp://$server/debian/"
+debian_mirror="http://$server/debian/"
-rsync_debian_mirror="$server::debian"
+wget_debian_mirror="ftp://$server/debian"
-profiles="default advanced"
+dist="jessie"
 mirror_components="main contrib non-free"
 export ARCH="amd64"
 export DISKINFO="YunoHost $(date --utc +%Y%m%d)"
 export OMIT_MANUAL=1
 export OMIT_RELEASE_NOTES=1
 export INSTALLER_CD=2
-export DOJIGDO=0
+export DOJIGDO=1
-export SPLASHPNG="`pwd`/extras/splash.png"