From 6c70fef83b9fc54890420ac626b5bfa6caa4a1c4 Mon Sep 17 00:00:00 2001 From: Gardais Jeremy Date: Tue, 26 Jul 2016 13:55:22 +0200 Subject: [PATCH] Harmonize all pressed files --- preseed/debian/jessie/preseed.cfg | 24 +++++++-------- preseed/debian/jessie/preseed_cinnamon.cfg | 26 ++++++++-------- preseed/debian/jessie/preseed_gnome.cfg | 26 ++++++++-------- preseed/debian/jessie/preseed_mate.cfg | 26 ++++++++-------- preseed/debian/wheezy/preseed.cfg | 36 ++++++++++++++++------ preseed/debian/wheezy/preseed_gnome.cfg | 31 ++++++++----------- 6 files changed, 86 insertions(+), 83 deletions(-) diff --git a/preseed/debian/jessie/preseed.cfg b/preseed/debian/jessie/preseed.cfg index f763fdf..daf38e2 100644 --- a/preseed/debian/jessie/preseed.cfg +++ b/preseed/debian/jessie/preseed.cfg @@ -39,7 +39,6 @@ d-i keyboard-configuration/xkb-keymap select French ##################################################################### # To set a different link detection timeout (default is 3 seconds). - # Values are interpreted as seconds. d-i netcfg/link_detection_timeout string 20 @@ -79,7 +78,7 @@ d-i hw-detect/load_firmware boolean true ## Mirror d-i mirror/country string FR d-i mirror/http/hostname string ftp.fr.debian.org -d-i mirror/http/directory string /debian +d-i mirror/http/directory string /debian/ d-i mirror/http/proxy string d-i mirror/http/mirror string ftp.fr.debian.org d-i mirror/suite string @@ -98,17 +97,17 @@ user-setup-udeb passwd/root-login boolean true d-i passwd/root-password-crypted password $6$ceGTxMxc$gXajYByJna1cfTjaST3TcF0FfrlSAaEcmCiOMq/DBOuD0tlu8VYQosZPgwcFT4bCuODMErU/fgRxZEeu9c10V0 # Create a normal user account now? -d-i passwd/make-user boolean false -# User name -#d-i passwd/user-fullname string bob -#d-i passwd/username string bob +d-i passwd/make-user boolean false +## User name +#d-i passwd/user-fullname string bob +#d-i passwd/username string bob ## User password in clear text -#d-i passwd/user-password password insecure -#d-i passwd/user-password-again password insecure +#d-i passwd/user-password password insecure +#d-i passwd/user-password-again password insecure ## ... or encrypted with MD5 hash -##d-i passwd/user-password-crypted password $1$098f6bcd4621d373cade4e832627b4f6 +##d-i passwd/user-password-crypted password $1$098f6bcd4621d373cade4e832627b4f6 ## Set User UID -#d-i passwd/user-uid string 1000 +#d-i passwd/user-uid string 1000 @@ -284,7 +283,6 @@ d-i partman-auto/expert_recipe string \ # Automatically partition without confirmation d-i partman/confirm_write_new_label boolean true -#d-i partman/choose_partition select Finish partitioning and write changes to disk d-i partman/choose_partition select finish d-i partman/confirm boolean true d-i partman/confirm_nooverwrite boolean true @@ -307,13 +305,13 @@ d-i apt-setup/contrib boolean true # Additional repositories, local[0-9] available d-i apt-setup/local0/repository string \ http://apt.puppetlabs.com jessie main dependencies -#d-i apt-setup/local0/comment string local server +#d-i apt-setup/local0/comment string local server # Enable deb-src lines d-i apt-setup/local0/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 -#d-i apt-setup/local0/key string http://local.server/key +#d-i apt-setup/local0/key string http://local.server/key d-i apt-setup/local0/key string http://apt.puppetlabs.com/pubkey.gpg # By default the installer requires that repositories be authenticated diff --git a/preseed/debian/jessie/preseed_cinnamon.cfg b/preseed/debian/jessie/preseed_cinnamon.cfg index db0e905..7aaf79f 100644 --- a/preseed/debian/jessie/preseed_cinnamon.cfg +++ b/preseed/debian/jessie/preseed_cinnamon.cfg @@ -39,7 +39,6 @@ d-i keyboard-configuration/xkb-keymap select French ##################################################################### # To set a different link detection timeout (default is 3 seconds). - # Values are interpreted as seconds. d-i netcfg/link_detection_timeout string 20 @@ -79,7 +78,7 @@ d-i hw-detect/load_firmware boolean true ## Mirror d-i mirror/country string FR d-i mirror/http/hostname string ftp.fr.debian.org -d-i mirror/http/directory string /debian +d-i mirror/http/directory string /debian/ d-i mirror/http/proxy string d-i mirror/http/mirror string ftp.fr.debian.org d-i mirror/suite string @@ -94,21 +93,21 @@ user-setup-udeb passwd/root-login boolean true # Root password in clear text #d-i passwd/root-password password r00tme #d-i passwd/root-password-again password r00tme -# ... or encrypted with MD5 hash +# ... or encrypted with {MD5, SHA512, …) hash d-i passwd/root-password-crypted password $6$ceGTxMxc$gXajYByJna1cfTjaST3TcF0FfrlSAaEcmCiOMq/DBOuD0tlu8VYQosZPgwcFT4bCuODMErU/fgRxZEeu9c10V0 # Create a normal user account now? -d-i passwd/make-user boolean false -# User name -#d-i passwd/user-fullname string bob -#d-i passwd/username string bob +d-i passwd/make-user boolean false +## User name +#d-i passwd/user-fullname string bob +#d-i passwd/username string bob ## User password in clear text -#d-i passwd/user-password password insecure -#d-i passwd/user-password-again password insecure +#d-i passwd/user-password password insecure +#d-i passwd/user-password-again password insecure ## ... or encrypted with MD5 hash -##d-i passwd/user-password-crypted password $1$098f6bcd4621d373cade4e832627b4f6 +##d-i passwd/user-password-crypted password $1$098f6bcd4621d373cade4e832627b4f6 ## Set User UID -#d-i passwd/user-uid string 1000 +#d-i passwd/user-uid string 1000 @@ -275,7 +274,6 @@ d-i partman-auto/expert_recipe string \ # Automatically partition without confirmation d-i partman/confirm_write_new_label boolean true -#d-i partman/choose_partition select Finish partitioning and write changes to disk d-i partman/choose_partition select finish d-i partman/confirm boolean true d-i partman/confirm_nooverwrite boolean true @@ -298,13 +296,13 @@ d-i apt-setup/contrib boolean true # Additional repositories, local[0-9] available d-i apt-setup/local0/repository string \ http://apt.puppetlabs.com jessie main dependencies -#d-i apt-setup/local0/comment string local server +#d-i apt-setup/local0/comment string local server # Enable deb-src lines d-i apt-setup/local0/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 -#d-i apt-setup/local0/key string http://local.server/key +#d-i apt-setup/local0/key string http://local.server/key d-i apt-setup/local0/key string http://apt.puppetlabs.com/pubkey.gpg # By default the installer requires that repositories be authenticated diff --git a/preseed/debian/jessie/preseed_gnome.cfg b/preseed/debian/jessie/preseed_gnome.cfg index 57c7f34..54bc473 100644 --- a/preseed/debian/jessie/preseed_gnome.cfg +++ b/preseed/debian/jessie/preseed_gnome.cfg @@ -39,7 +39,6 @@ d-i keyboard-configuration/xkb-keymap select French ##################################################################### # To set a different link detection timeout (default is 3 seconds). - # Values are interpreted as seconds. d-i netcfg/link_detection_timeout string 20 @@ -79,7 +78,7 @@ d-i hw-detect/load_firmware boolean true ## Mirror d-i mirror/country string FR d-i mirror/http/hostname string ftp.fr.debian.org -d-i mirror/http/directory string /debian +d-i mirror/http/directory string /debian/ d-i mirror/http/proxy string d-i mirror/http/mirror string ftp.fr.debian.org d-i mirror/suite string @@ -94,21 +93,21 @@ user-setup-udeb passwd/root-login boolean true # Root password in clear text #d-i passwd/root-password password r00tme #d-i passwd/root-password-again password r00tme -# ... or encrypted with MD5 hash +# ... or encrypted with {MD5, SHA512, …) hash d-i passwd/root-password-crypted password $6$ceGTxMxc$gXajYByJna1cfTjaST3TcF0FfrlSAaEcmCiOMq/DBOuD0tlu8VYQosZPgwcFT4bCuODMErU/fgRxZEeu9c10V0 # Create a normal user account now? -d-i passwd/make-user boolean false -# User name -#d-i passwd/user-fullname string bob -#d-i passwd/username string bob +d-i passwd/make-user boolean false +## User name +#d-i passwd/user-fullname string bob +#d-i passwd/username string bob ## User password in clear text -#d-i passwd/user-password password insecure -#d-i passwd/user-password-again password insecure +#d-i passwd/user-password password insecure +#d-i passwd/user-password-again password insecure ## ... or encrypted with MD5 hash -##d-i passwd/user-password-crypted password $1$098f6bcd4621d373cade4e832627b4f6 +##d-i passwd/user-password-crypted password $1$098f6bcd4621d373cade4e832627b4f6 ## Set User UID -#d-i passwd/user-uid string 1000 +#d-i passwd/user-uid string 1000 @@ -275,7 +274,6 @@ d-i partman-auto/expert_recipe string \ # Automatically partition without confirmation d-i partman/confirm_write_new_label boolean true -#d-i partman/choose_partition select Finish partitioning and write changes to disk d-i partman/choose_partition select finish d-i partman/confirm boolean true d-i partman/confirm_nooverwrite boolean true @@ -298,13 +296,13 @@ d-i apt-setup/contrib boolean true # Additional repositories, local[0-9] available d-i apt-setup/local0/repository string \ http://apt.puppetlabs.com jessie main dependencies -#d-i apt-setup/local0/comment string local server +#d-i apt-setup/local0/comment string local server # Enable deb-src lines d-i apt-setup/local0/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 -#d-i apt-setup/local0/key string http://local.server/key +#d-i apt-setup/local0/key string http://local.server/key d-i apt-setup/local0/key string http://apt.puppetlabs.com/pubkey.gpg # By default the installer requires that repositories be authenticated diff --git a/preseed/debian/jessie/preseed_mate.cfg b/preseed/debian/jessie/preseed_mate.cfg index f0d1746..f70f4f5 100644 --- a/preseed/debian/jessie/preseed_mate.cfg +++ b/preseed/debian/jessie/preseed_mate.cfg @@ -39,7 +39,6 @@ d-i keyboard-configuration/xkb-keymap select French ##################################################################### # To set a different link detection timeout (default is 3 seconds). - # Values are interpreted as seconds. d-i netcfg/link_detection_timeout string 20 @@ -79,7 +78,7 @@ d-i hw-detect/load_firmware boolean true ## Mirror d-i mirror/country string FR d-i mirror/http/hostname string ftp.fr.debian.org -d-i mirror/http/directory string /debian +d-i mirror/http/directory string /debian/ d-i mirror/http/proxy string d-i mirror/http/mirror string ftp.fr.debian.org d-i mirror/suite string @@ -94,21 +93,21 @@ user-setup-udeb passwd/root-login boolean true # Root password in clear text #d-i passwd/root-password password r00tme #d-i passwd/root-password-again password r00tme -# ... or encrypted with MD5 hash +# ... or encrypted with {MD5, SHA512, …) hash d-i passwd/root-password-crypted password $6$ceGTxMxc$gXajYByJna1cfTjaST3TcF0FfrlSAaEcmCiOMq/DBOuD0tlu8VYQosZPgwcFT4bCuODMErU/fgRxZEeu9c10V0 # Create a normal user account now? -d-i passwd/make-user boolean false -# User name -#d-i passwd/user-fullname string bob -#d-i passwd/username string bob +d-i passwd/make-user boolean false +## User name +#d-i passwd/user-fullname string bob +#d-i passwd/username string bob ## User password in clear text -#d-i passwd/user-password password insecure -#d-i passwd/user-password-again password insecure +#d-i passwd/user-password password insecure +#d-i passwd/user-password-again password insecure ## ... or encrypted with MD5 hash -##d-i passwd/user-password-crypted password $1$098f6bcd4621d373cade4e832627b4f6 +##d-i passwd/user-password-crypted password $1$098f6bcd4621d373cade4e832627b4f6 ## Set User UID -#d-i passwd/user-uid string 1000 +#d-i passwd/user-uid string 1000 @@ -275,7 +274,6 @@ d-i partman-auto/expert_recipe string \ # Automatically partition without confirmation d-i partman/confirm_write_new_label boolean true -#d-i partman/choose_partition select Finish partitioning and write changes to disk d-i partman/choose_partition select finish d-i partman/confirm boolean true d-i partman/confirm_nooverwrite boolean true @@ -298,13 +296,13 @@ d-i apt-setup/contrib boolean true # Additional repositories, local[0-9] available d-i apt-setup/local0/repository string \ http://apt.puppetlabs.com jessie main dependencies -#d-i apt-setup/local0/comment string local server +#d-i apt-setup/local0/comment string local server # Enable deb-src lines d-i apt-setup/local0/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 -#d-i apt-setup/local0/key string http://local.server/key +#d-i apt-setup/local0/key string http://local.server/key d-i apt-setup/local0/key string http://apt.puppetlabs.com/pubkey.gpg # By default the installer requires that repositories be authenticated diff --git a/preseed/debian/wheezy/preseed.cfg b/preseed/debian/wheezy/preseed.cfg index 2a8026f..bc20eca 100644 --- a/preseed/debian/wheezy/preseed.cfg +++ b/preseed/debian/wheezy/preseed.cfg @@ -2,7 +2,7 @@ # Howto use #################################################################### -## With an PXE boot: +## With a PXE boot: #label wheezy # menu label Debian GNU/Linux Wheezy 64 bits WITH ^PRESEED # kernel installer/debian/wheezy/amd64/linux @@ -58,6 +58,19 @@ d-i hw-detect/load_firmware boolean true +##################################################################### +## Remote install (Manual) +##################################################################### +# Use the following settings if you wish to make use of the network-console +# component for remote installation over SSH. This only makes sense if you +# intend to perform the remainder of the installation manually. +#d-i anna/choose_modules string network-console +#d-i network-console/authorized_keys_url string http://10.0.0.1/openssh-key +#d-i network-console/password password r00tme +#d-i network-console/password-again password r00tme + + + ##################################################################### ## Mirror settings ##################################################################### @@ -80,7 +93,7 @@ user-setup-udeb passwd/root-login boolean true # Root password in clear text #d-i passwd/root-password password r00tme #d-i passwd/root-password-again password r00tme -# ... or encrypted with MD5 hash +# ... or encrypted with {MD5, SHA512, …) hash d-i passwd/root-password-crypted password $6$ceGTxMxc$gXajYByJna1cfTjaST3TcF0FfrlSAaEcmCiOMq/DBOuD0tlu8VYQosZPgwcFT4bCuODMErU/fgRxZEeu9c10V0 # Create a normal user account now? @@ -92,7 +105,7 @@ user-setup-udeb passwd/make-user boolean false #d-i passwd/user-password password insecure #d-i passwd/user-password-again password insecure ## ... or encrypted with MD5 hash -##d-i passwd/user-password-crypted password $1$098f6bcd4621d373cade4e832627b4f6 +##d-i passwd/user-password-crypted password $1$098f6bcd4621d373cade4e832627b4f6 ## Set User UID #d-i passwd/user-uid string 1000 @@ -270,7 +283,7 @@ d-i partman-auto/expert_recipe string \ # Automatically partition without confirmation d-i partman/confirm_write_new_label boolean true -d-i partman/choose_partition select Finish partitioning and write changes to disk +d-i partman/choose_partition select finish d-i partman/confirm boolean true d-i partman/confirm_nooverwrite boolean true @@ -304,20 +317,21 @@ d-i apt-setup/local0/key string http://apt.puppetl # By default the installer requires that repositories be authenticated # using a known gpg key. This setting can be used to disable that # authentication. Warning: Insecure, not recommended. -#d-i debian-installer/allow_unauthenticated string true +#d-i debian-installer/allow_unauthenticated string true ## Choose packages tasksel tasksel/first multiselect ssh-server standard ## Individual additional packages to install -d-i pkgsel/include string tmux puppet zsh tftp-hpa +# tftp-hpa to download an archive (see preseed/late_command at the end of this file) +d-i pkgsel/include string tmux puppet zsh tftp-hpa # Whether to upgrade packages after debootstrap. # Allowed values: none, safe-upgrade, full-upgrade -d-i pkgsel/upgrade select full-upgrade +d-i pkgsel/upgrade select full-upgrade # Participate to Popularity Contest (disable for an unconnected server) -d-i popularity-contest/participate boolean false +d-i popularity-contest/participate boolean true @@ -334,12 +348,13 @@ d-i popularity-contest/participate boolean false # This is fairly safe to set, it makes grub install automatically to the MBR # if no other operating system is detected on the machine. -d-i grub-installer/only_debian boolean true +d-i grub-installer/only_debian boolean true # This one makes grub-installer install to the MBR if it also finds some other # OS, which is less safe as it might not be able to boot that other OS. -d-i grub-installer/with_other_os boolean true +d-i grub-installer/with_other_os boolean true +d-i grub-installer/bootdev string default ##################################################################### @@ -362,6 +377,7 @@ d-i cdrom-detect/eject boolean false #in-target wget -O /tmp/latecommand.tar.gz "https://wiki.101010.fr/lib/exe/fetch.php?media=documentation:administration_systeme:latecommand.tar.gz" --no-check-certificate ; \ d-i preseed/late_command string in-target chsh -s /bin/zsh ; \ +in-target /bin/sed -i 's/without-password/yes/g' /etc/ssh/sshd_config ; \ in-target /usr/bin/tftp 129.20.27.239 -c get scripts/latecommand.tar.gz /tmp/latecommand.tar.gz ; \ in-target tar xzf /tmp/latecommand.tar.gz -C /tmp/ ; \ in-target /bin/sh /tmp/latecommand/post.sh diff --git a/preseed/debian/wheezy/preseed_gnome.cfg b/preseed/debian/wheezy/preseed_gnome.cfg index 101ae86..610d7a2 100644 --- a/preseed/debian/wheezy/preseed_gnome.cfg +++ b/preseed/debian/wheezy/preseed_gnome.cfg @@ -4,7 +4,7 @@ ## With a PXE boot: #label wheezy -# menu label Debian GNU/Linux ^wheezy 64 bits WITH PRESEED +# menu label Debian GNU/Linux Wheezy 64 bits WITH ^PRESEED # kernel installer/debian/wheezy/amd64/linux # APPEND vga=normal initrd=installer/debian/wheezy/amd64/initrd_firm.gz auto=true interface=auto netcfg/dhcp_timeout=60 netcfg/choose_interface=auto priority=critical preseed/url=tftp://129.20.27.239/installer/debian/wheezy/amd64/preseed.cfg IPAPPEND 2 @@ -39,7 +39,6 @@ d-i keyboard-configuration/xkb-keymap select French ##################################################################### # To set a different link detection timeout (default is 3 seconds). - # Values are interpreted as seconds. d-i netcfg/link_detection_timeout string 20 @@ -79,7 +78,7 @@ d-i hw-detect/load_firmware boolean true ## Mirror d-i mirror/country string FR d-i mirror/http/hostname string ftp.fr.debian.org -d-i mirror/http/directory string /debian +d-i mirror/http/directory string /debian/ d-i mirror/http/proxy string d-i mirror/http/mirror string ftp.fr.debian.org d-i mirror/suite string @@ -94,21 +93,21 @@ user-setup-udeb passwd/root-login boolean true # Root password in clear text #d-i passwd/root-password password r00tme #d-i passwd/root-password-again password r00tme -# ... or encrypted with MD5 hash +# ... or encrypted with {MD5, SHA512, …) hash d-i passwd/root-password-crypted password $6$ceGTxMxc$gXajYByJna1cfTjaST3TcF0FfrlSAaEcmCiOMq/DBOuD0tlu8VYQosZPgwcFT4bCuODMErU/fgRxZEeu9c10V0 # Create a normal user account now? -d-i passwd/make-user boolean false -# User name -#d-i passwd/user-fullname string bob -#d-i passwd/username string bob +user-setup-udeb passwd/make-user boolean false +## User name +#d-i passwd/user-fullname string bob +#d-i passwd/username string bob ## User password in clear text -#d-i passwd/user-password password insecure -#d-i passwd/user-password-again password insecure +#d-i passwd/user-password password insecure +#d-i passwd/user-password-again password insecure ## ... or encrypted with MD5 hash -##d-i passwd/user-password-crypted password $1$098f6bcd4621d373cade4e832627b4f6 +##d-i passwd/user-password-crypted password $1$098f6bcd4621d373cade4e832627b4f6 ## Set User UID -#d-i passwd/user-uid string 1000 +#d-i passwd/user-uid string 1000 @@ -275,7 +274,6 @@ d-i partman-auto/expert_recipe string \ # Automatically partition without confirmation d-i partman/confirm_write_new_label boolean true -#d-i partman/choose_partition select Finish partitioning and write changes to disk d-i partman/choose_partition select finish d-i partman/confirm boolean true d-i partman/confirm_nooverwrite boolean true @@ -298,13 +296,13 @@ d-i apt-setup/contrib boolean true # Additional repositories, local[0-9] available d-i apt-setup/local0/repository string \ http://apt.puppetlabs.com wheezy main dependencies -#d-i apt-setup/local0/comment string local server +#d-i apt-setup/local0/comment string local server # Enable deb-src lines d-i apt-setup/local0/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 -#d-i apt-setup/local0/key string http://local.server/key +#d-i apt-setup/local0/key string http://local.server/key d-i apt-setup/local0/key string http://apt.puppetlabs.com/pubkey.gpg # By default the installer requires that repositories be authenticated @@ -347,9 +345,6 @@ d-i grub-installer/only_debian boolean true # OS, which is less safe as it might not be able to boot that other OS. d-i grub-installer/with_other_os boolean true -# Since Debian wheezy, the d-i will ask to specify the device for Grub. -# Should use 'default', to use the default system disk -# Fix: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=759737 d-i grub-installer/bootdev string default