diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ff211f..04a921a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ * Leave standart task in peace to be able to have a X session for user's nodes… (see #17). * Update doc about Debian distribution name and remove useless entries (oldStable). * No longer define zsh as default shell for root. +* Installation of aptitude, puppet, tmux and zsh move to latecommand script (post.sh). ## Release 0.4.1 ### Improvement diff --git a/README.md b/README.md index 92dfd92..bfba2fd 100644 --- a/README.md +++ b/README.md @@ -127,7 +127,7 @@ Preseeding provides a way to set answers to questions asked by the Debian-Instal * Specific to Debian Jessie and older : * Select **ssh-server** and **standard** in _tasksel_ for installation. * Add a repository for Puppet (http://apt.puppetlabs.com) and the GPG key. - * Add additional packages : **puppet**, **tmux**, **zsh** and **tftp-hpa** (to be able to download the [latecommand archive from the PXE server][debian latecommand howto]). + * Add additional packages : **tftp-hpa** (to be able to download the [latecommand archive from the PXE server][debian latecommand howto]). ------ diff --git a/preseed/debian/jessie/preseed.cfg b/preseed/debian/jessie/preseed.cfg index 8ac696f..07979bb 100644 --- a/preseed/debian/jessie/preseed.cfg +++ b/preseed/debian/jessie/preseed.cfg @@ -298,7 +298,7 @@ tasksel tasksel/first multiselect ssh-server standar ## Individual additional packages to install # 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 +d-i pkgsel/include string tftp-hpa # Whether to upgrade packages after debootstrap. # Allowed values: none, safe-upgrade, full-upgrade d-i pkgsel/upgrade select full-upgrade diff --git a/preseed/debian/jessie/preseed_cinnamon.cfg b/preseed/debian/jessie/preseed_cinnamon.cfg index ae5f4bf..cce3fbc 100644 --- a/preseed/debian/jessie/preseed_cinnamon.cfg +++ b/preseed/debian/jessie/preseed_cinnamon.cfg @@ -289,7 +289,7 @@ tasksel tasksel/first multiselect ssh-server standar ## Individual additional packages to install # 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 +d-i pkgsel/include string tftp-hpa # Whether to upgrade packages after debootstrap. # Allowed values: none, safe-upgrade, full-upgrade d-i pkgsel/upgrade select full-upgrade diff --git a/preseed/debian/jessie/preseed_gnome.cfg b/preseed/debian/jessie/preseed_gnome.cfg index caa7710..60a8aed 100644 --- a/preseed/debian/jessie/preseed_gnome.cfg +++ b/preseed/debian/jessie/preseed_gnome.cfg @@ -289,7 +289,7 @@ tasksel tasksel/first multiselect ssh-server standar ## Individual additional packages to install # 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 +d-i pkgsel/include string tftp-hpa # Whether to upgrade packages after debootstrap. # Allowed values: none, safe-upgrade, full-upgrade d-i pkgsel/upgrade select full-upgrade diff --git a/preseed/debian/jessie/preseed_mate.cfg b/preseed/debian/jessie/preseed_mate.cfg index 04cbcd4..0822964 100644 --- a/preseed/debian/jessie/preseed_mate.cfg +++ b/preseed/debian/jessie/preseed_mate.cfg @@ -289,7 +289,7 @@ tasksel tasksel/first multiselect ssh-server standar ## Individual additional packages to install # 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 +d-i pkgsel/include string tftp-hpa # Whether to upgrade packages after debootstrap. # Allowed values: none, safe-upgrade, full-upgrade d-i pkgsel/upgrade select full-upgrade diff --git a/preseed/debian/stretch/preseed.cfg b/preseed/debian/stretch/preseed.cfg index 04e80d1..afdfe2e 100644 --- a/preseed/debian/stretch/preseed.cfg +++ b/preseed/debian/stretch/preseed.cfg @@ -291,7 +291,7 @@ tasksel tasksel/first multiselect ssh-server ## Individual additional packages to install # tftp-hpa to download an archive (see preseed/late_command at the end of this file) -d-i pkgsel/include string aptitude tftp-hpa +d-i pkgsel/include string tftp-hpa # Whether to upgrade packages after debootstrap. # Allowed values: none, safe-upgrade, full-upgrade d-i pkgsel/upgrade select full-upgrade diff --git a/preseed/debian/stretch/preseed.cinnamon.uefi.cfg b/preseed/debian/stretch/preseed.cinnamon.uefi.cfg index 9d7fb96..7848aa5 100644 --- a/preseed/debian/stretch/preseed.cinnamon.uefi.cfg +++ b/preseed/debian/stretch/preseed.cinnamon.uefi.cfg @@ -303,7 +303,7 @@ tasksel tasksel/first multiselect ssh-server standar ## Individual additional packages to install # tftp-hpa to download an archive (see preseed/late_command at the end of this file) -d-i pkgsel/include string aptitude tmux zsh tftp-hpa +d-i pkgsel/include string tftp-hpa # Whether to upgrade packages after debootstrap. # Allowed values: none, safe-upgrade, full-upgrade d-i pkgsel/upgrade select full-upgrade diff --git a/preseed/debian/stretch/preseed_cinnamon.cfg b/preseed/debian/stretch/preseed_cinnamon.cfg index 115e03f..07212a5 100644 --- a/preseed/debian/stretch/preseed_cinnamon.cfg +++ b/preseed/debian/stretch/preseed_cinnamon.cfg @@ -279,7 +279,7 @@ tasksel tasksel/first multiselect ssh-server standar ## Individual additional packages to install # tftp-hpa to download an archive (see preseed/late_command at the end of this file) -d-i pkgsel/include string aptitude tmux zsh tftp-hpa +d-i pkgsel/include string tftp-hpa # Whether to upgrade packages after debootstrap. # Allowed values: none, safe-upgrade, full-upgrade d-i pkgsel/upgrade select full-upgrade diff --git a/preseed/debian/stretch/preseed_computenode.cfg b/preseed/debian/stretch/preseed_computenode.cfg index 68edf13..888fd26 100644 --- a/preseed/debian/stretch/preseed_computenode.cfg +++ b/preseed/debian/stretch/preseed_computenode.cfg @@ -274,7 +274,7 @@ tasksel tasksel/first multiselect ssh-server ## Individual additional packages to install # tftp-hpa to download an archive (see preseed/late_command at the end of this file) -d-i pkgsel/include string aptitude tftp-hpa +d-i pkgsel/include string tftp-hpa # Whether to upgrade packages after debootstrap. # Allowed values: none, safe-upgrade, full-upgrade d-i pkgsel/upgrade select full-upgrade diff --git a/preseed/debian/stretch/preseed_gnome.cfg b/preseed/debian/stretch/preseed_gnome.cfg index f91f79c..7af2475 100644 --- a/preseed/debian/stretch/preseed_gnome.cfg +++ b/preseed/debian/stretch/preseed_gnome.cfg @@ -279,7 +279,7 @@ tasksel tasksel/first multiselect ssh-server standar ## Individual additional packages to install # tftp-hpa to download an archive (see preseed/late_command at the end of this file) -d-i pkgsel/include string aptitude tmux zsh tftp-hpa +d-i pkgsel/include string tftp-hpa # Whether to upgrade packages after debootstrap. # Allowed values: none, safe-upgrade, full-upgrade d-i pkgsel/upgrade select full-upgrade diff --git a/preseed/debian/stretch/preseed_mate.cfg b/preseed/debian/stretch/preseed_mate.cfg index 8767be0..b688f14 100644 --- a/preseed/debian/stretch/preseed_mate.cfg +++ b/preseed/debian/stretch/preseed_mate.cfg @@ -279,7 +279,7 @@ tasksel tasksel/first multiselect ssh-server standar ## Individual additional packages to install # tftp-hpa to download an archive (see preseed/late_command at the end of this file) -d-i pkgsel/include string aptitude tmux zsh tftp-hpa +d-i pkgsel/include string tftp-hpa # Whether to upgrade packages after debootstrap. # Allowed values: none, safe-upgrade, full-upgrade d-i pkgsel/upgrade select full-upgrade diff --git a/scripts/README.md b/scripts/README.md index 2928dbe..1eea728 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -48,10 +48,16 @@ Some useful configurations after a Debian installation : * Move `rsyslog` default configuration to two files (__/etc/rsyslog.conf__ and __/etc/rsyslog.d/99syslog.conf__). * `logrotate` now rotate logs to specific directories (such as __/var/log/syslog.d__, __/var/log/mail/__,…) instead of __/var/log/__. * Create these new directories. - * Remove some useless packages (nfs, tasksel,…). + * Packages : + * Add minimal packages for a working system (aptitude, tmux and zsh). + * Remove some useless packages (nfs rpcbind,…). + * Ensure an openssh-server is available. * Permit root SSH login with password (no standard user…). * … +Specific to Debian Stretch : + * Add python-apt (Ansible dependencie). + Specific to Debian Jessie and older : * Smarter rsyslog (more directories and less files in **/var/log**). * Shorter configuration file and use more files from /etc/rsyslog.d/ @@ -66,6 +72,7 @@ Specific to Debian Jessie and older : * _localX_ logs from /var/log/localX.log to __/var/log/syslog/localX.log__ * _syslog_ logs from /var/log/syslog.log to __/var/log/syslog/syslog.log__ * _authpriv_ logs from … to __/var/log/security/authpriv.log__ + * Add puppet package. #### How-to use it * First, make an archive of the script and directories : @@ -75,8 +82,7 @@ tar czvf latecommand.tar.gz latecommand/ ``` * Then, it can be use at the end of a Debian preseed file : ``` -d-i preseed/late_command string in-target chsh -s /bin/zsh ; \ -in-target /usr/bin/tftp ${IP.SRV.TFTP} -c get ${PATH/TO/TFTPD/ROOT}/scripts/latecommand.tar.gz /tmp/latecommand.tar.gz ; \ +d-i preseed/late_command string in-target /usr/bin/tftp ${IP.SRV.TFTP} -c get ${PATH/TO/TFTPD/ROOT}/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/scripts/latecommand.tar.gz b/scripts/latecommand.tar.gz index 46be606..96032e9 100644 Binary files a/scripts/latecommand.tar.gz and b/scripts/latecommand.tar.gz differ diff --git a/scripts/latecommand/post.jessie.sh b/scripts/latecommand/post.jessie.sh index 41fd0d3..b8e5cae 100755 --- a/scripts/latecommand/post.jessie.sh +++ b/scripts/latecommand/post.jessie.sh @@ -54,7 +54,7 @@ mkdir -p -- /var/log/journal ## Packages {{{ # Ensure to have some basic packages -apt -y install aptitude tmux zsh +apt -y install aptitude puppet tmux zsh # Remove NFS and rpcbind aptitude -y remove nfs-common rpcbind