From 14662149fe48aa3b2e106c69c83a009f7733c7f0 Mon Sep 17 00:00:00 2001 From: Tobias Stein Date: Sat, 10 Dec 2022 21:18:23 +0100 Subject: [PATCH] Reformat variable template for fai class HW4F_DESKTOP --- .../srv/fai/config/class/HW4F_DESKTOP.var.j2 | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/roles/fai/templates/srv/fai/config/class/HW4F_DESKTOP.var.j2 b/roles/fai/templates/srv/fai/config/class/HW4F_DESKTOP.var.j2 index eb7ea17..90a2fbb 100644 --- a/roles/fai/templates/srv/fai/config/class/HW4F_DESKTOP.var.j2 +++ b/roles/fai/templates/srv/fai/config/class/HW4F_DESKTOP.var.j2 @@ -1,20 +1,20 @@ ### CONFIGURE TIME -UTC=yes -TIMEZONE=Europe/Berlin +UTC="yes" +TIMEZONE="Europe/Berlin" ### INSTALL PARAMETERS STOP_ON_ERROR=700 MAXPACKAGES=800 HOSTNAME="user-pc" -KEYMAP=de-latin1-nodeadkeys +KEYMAP="de-latin1-nodeadkeys" +# USER AND PASSWORD ROOTPW='{{ fai_hw4f_profile_password | password_hash("sha512", fai_hw4f_password_salt ) }}' -# START USER AND PASSWORD -username={{ fai_hw4f_profile_username }} +username='{{ fai_hw4f_profile_username }}' USERPW='{{ fai_hw4f_profile_password | password_hash("sha512", fai_hw4f_password_salt ) }}' @@ -23,12 +23,11 @@ SUPRESS_GNOME_INITIAL_SCREEN=1 ### ALREADY SET IN IPXE MENU ON KERNEL CMDLINE #FAI_FLAGS="verbose sshd createvt menu " FAI_ALLOW_UNSIGNED=0 -APTPROXY=http://{{ server_name }}:3142 +APTPROXY="http://{{ server_name }}:3142" ### CONFIGURE LOG UPLOAD {% if fai_loguser is defined and fai_loguser is none %} -### DISABLE LOG UPLOAD LOGUSER= {% elif fai_loguser is defined and fai_loguser is not none %}