From 52ea327d7dbb227035b941e73224cb942b4ca076 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Thu, 3 Mar 2022 21:29:17 +0100 Subject: Rename faiinstall.conf to debian-edu-fai.conf. --- bin/debian-edu-faiinstall | 6 +-- conf/debian-edu/debian-edu-fai.conf | 85 +++++++++++++++++++++++++++++++++++++ conf/debian-edu/faiinstall.conf | 85 ------------------------------------- debian/install | 2 +- 4 files changed, 89 insertions(+), 89 deletions(-) create mode 100644 conf/debian-edu/debian-edu-fai.conf delete mode 100644 conf/debian-edu/faiinstall.conf diff --git a/bin/debian-edu-faiinstall b/bin/debian-edu-faiinstall index 5f80f74..e803a4c 100755 --- a/bin/debian-edu-faiinstall +++ b/bin/debian-edu-faiinstall @@ -84,8 +84,8 @@ fi # source debian-edu-fai's config file # Allow site specific overrides to the variables -if [ -f /etc/debian-edu/faiinstall.conf ] ; then - . /etc/debian-edu/faiinstall.conf +if [ -f /etc/debian-edu/debian-edu-fai.conf ] ; then + . /etc/debian-edu/debian-edu-fai.conf fi # keep a copy of /srv/tftp/ltsp if this is the first attempt to deploy @@ -326,7 +326,7 @@ cat < "${tftpdir}/debian-edu-fai/ltsp.ipxe" # Set the default image (img) based on arch, or to root-path if it's not empty #cpuid --ext 29 && set img amd64+${codename} || set img i386+${codename} -# choose default boot entry (via configurable variables, see /etc/debian-edu/faiinstall.conf) +# choose default boot entry (via configurable variables, see /etc/debian-edu/debian-edu-fai.conf) set img ${default_arch}+${default_codename} goto start diff --git a/conf/debian-edu/debian-edu-fai.conf b/conf/debian-edu/debian-edu-fai.conf new file mode 100644 index 0000000..4ffd80d --- /dev/null +++ b/conf/debian-edu/debian-edu-fai.conf @@ -0,0 +1,85 @@ +# Examples for local settings that can customize the +# 'debian-edu-faiinstall' script. + +# Run 'debian-edu-faiinstall' to re-generate the netboot +# environment and the iPXE menu each time any changes have +# been made... + +# For enabling FAI's savelog feature (pushing the installation logs +# of clients to the FAI server host at the end of an installation), +# some manual steps are required: +# +# IMPORTANT: These steps are required _before_ creating any nfsroot +# installer chroots (i.e. before running the debian-edu-faiinstall script). +# +# 1. Comment out fai_logserver and fai_loguser below. +# 2. adduser --system --home /var/log/fai/client-logs --shell /bin/bash fai +# 3. su - fai +# 4. ssh-keygen +# 5. cat ~fai/.ssh/id_rsa.pub > ~fai/.ssh/authorized_keys +# 6. Create ~fai/.ssh/known_hosts by... +# 7. (as user 'fai'): ssh fai@$(hostname -f) +# 8. Accept host key and by that add it to ~fai/.ssh/known_hosts +# + +# FAI server: +#fai_logserver="$(hostname -f)" + +# FAI system user: +#fai_loguser='fai' + +# APT mirror to be used... +#mirrorurl=http://deb.debian.org/debian + +#... or alternatively, an 'apt-cacher-ng' on the gateway IP: +#mirrorurl=http://10.0.0.1:3142/debian + +# If e.g. 'apt-cacher-ng' is running on the gateway and should be used for installation +# as a http proxy, then... +#http_proxy=http://10.0.0.1:3142 +#ftp_proxy=http://10.0.0.1:3142 + +# ...or alternatively, if squid-deb-proxy is running on the faiserver. +#http_proxy="http://faiserver:8000" +#ftp_proxy="http://faiserver:8000" + +# Where to place tftp config folders/files... (default: /srv/tftp) +#tftpdir=/srv/tftp + +# List of Debian versions (as codenames) to build FAI installers for (default: same codename +# as the FAI installer host's Debian version). +#codenames="bullseye bookworm" + +# For generating the default boot entry in iPXE boot menu (default: first name in codenames, see above) +#default_codename="bookworm" + +# FAI installation chroot architecture (default: auto-detected from the FAI installer host). +# +# If your FAI installer host is amd64 and you want to create i386 installer NFSROOTs then +# make sure to run dpkg --add-architecture i386 on the FAI installer host before running +# the 'debian-edu-faiinstall' script (otherwise, debootstrap will run as qemu-debootstrap +# and that will be reallllyyyy slow). +#archs="amd64 i386" + +# For generating the default boot entry in iPXE boot menu (default: first arch in archs, see above) +#default_arch="i386" + +# Password for the root account of FAI-installed devices (and for the installer chroot). +# Use '$ echo "yoursecrectpassword" | mkpasswd -m md5 -s' to create the pwhash. +# If not specified, the host's root password will be used... +#rootpw='' + +# For a local user account that can get created +# Use '$ echo "yoursecrectpassword" | mkpasswd -m md5 -s' to create the pwhash. +# If not specified, no local user account will be added to the FAI-installed system. +#localuser='' +#localuserpw='' + +# In case you want to provision FAI installed devices +# with system wide WiFi settings. +# Leave uncomment if you don't want to setup WiFi via FAI. +#wifi_essid='' +#wifi_passphrase='' + +# school tag (short name for school) +#school_tag='SKOLE' diff --git a/conf/debian-edu/faiinstall.conf b/conf/debian-edu/faiinstall.conf deleted file mode 100644 index 4ffd80d..0000000 --- a/conf/debian-edu/faiinstall.conf +++ /dev/null @@ -1,85 +0,0 @@ -# Examples for local settings that can customize the -# 'debian-edu-faiinstall' script. - -# Run 'debian-edu-faiinstall' to re-generate the netboot -# environment and the iPXE menu each time any changes have -# been made... - -# For enabling FAI's savelog feature (pushing the installation logs -# of clients to the FAI server host at the end of an installation), -# some manual steps are required: -# -# IMPORTANT: These steps are required _before_ creating any nfsroot -# installer chroots (i.e. before running the debian-edu-faiinstall script). -# -# 1. Comment out fai_logserver and fai_loguser below. -# 2. adduser --system --home /var/log/fai/client-logs --shell /bin/bash fai -# 3. su - fai -# 4. ssh-keygen -# 5. cat ~fai/.ssh/id_rsa.pub > ~fai/.ssh/authorized_keys -# 6. Create ~fai/.ssh/known_hosts by... -# 7. (as user 'fai'): ssh fai@$(hostname -f) -# 8. Accept host key and by that add it to ~fai/.ssh/known_hosts -# - -# FAI server: -#fai_logserver="$(hostname -f)" - -# FAI system user: -#fai_loguser='fai' - -# APT mirror to be used... -#mirrorurl=http://deb.debian.org/debian - -#... or alternatively, an 'apt-cacher-ng' on the gateway IP: -#mirrorurl=http://10.0.0.1:3142/debian - -# If e.g. 'apt-cacher-ng' is running on the gateway and should be used for installation -# as a http proxy, then... -#http_proxy=http://10.0.0.1:3142 -#ftp_proxy=http://10.0.0.1:3142 - -# ...or alternatively, if squid-deb-proxy is running on the faiserver. -#http_proxy="http://faiserver:8000" -#ftp_proxy="http://faiserver:8000" - -# Where to place tftp config folders/files... (default: /srv/tftp) -#tftpdir=/srv/tftp - -# List of Debian versions (as codenames) to build FAI installers for (default: same codename -# as the FAI installer host's Debian version). -#codenames="bullseye bookworm" - -# For generating the default boot entry in iPXE boot menu (default: first name in codenames, see above) -#default_codename="bookworm" - -# FAI installation chroot architecture (default: auto-detected from the FAI installer host). -# -# If your FAI installer host is amd64 and you want to create i386 installer NFSROOTs then -# make sure to run dpkg --add-architecture i386 on the FAI installer host before running -# the 'debian-edu-faiinstall' script (otherwise, debootstrap will run as qemu-debootstrap -# and that will be reallllyyyy slow). -#archs="amd64 i386" - -# For generating the default boot entry in iPXE boot menu (default: first arch in archs, see above) -#default_arch="i386" - -# Password for the root account of FAI-installed devices (and for the installer chroot). -# Use '$ echo "yoursecrectpassword" | mkpasswd -m md5 -s' to create the pwhash. -# If not specified, the host's root password will be used... -#rootpw='' - -# For a local user account that can get created -# Use '$ echo "yoursecrectpassword" | mkpasswd -m md5 -s' to create the pwhash. -# If not specified, no local user account will be added to the FAI-installed system. -#localuser='' -#localuserpw='' - -# In case you want to provision FAI installed devices -# with system wide WiFi settings. -# Leave uncomment if you don't want to setup WiFi via FAI. -#wifi_essid='' -#wifi_passphrase='' - -# school tag (short name for school) -#school_tag='SKOLE' diff --git a/debian/install b/debian/install index 35d413e..727d878 100644 --- a/debian/install +++ b/debian/install @@ -1,4 +1,4 @@ -conf/debian-edu/faiinstall.conf etc/debian-edu/ +conf/debian-edu/debian-edu-fai.conf etc/debian-edu/ conf/debian-edu/fai/ etc/debian-edu/ conf/exports.d/debian-edu-fai.exports usr/share/debian-edu-fai/exports.d/ fai/config usr/share/debian-edu-fai/fai/ -- cgit v1.2.3