Configurable user/pass

roles/fai/files/profiles/class/HW4F_DESKTOP.var

@@ -1,15 +0,0 @@
-# set time
-UTC=yes
-TIMEZONE=Europe/Berlin
-
-# some install parameters
-STOP_ON_ERROR=700
-MAXPACKAGES=800
-
-KEYMAP=de-latin1-nodeadkeys
-
-# start user and password
-username=demo
-USERPW='$1$kBnWcO.E$djxB128U7dMkrltJHPf6d1'
-
-SUPRESS_GNOME_INITIAL_SCREEN=1

roles/fai/files/profiles/scripts/UBUNTU/11-user

@@ -6,7 +6,7 @@ groups="adm cdrom sudo dip plugdev lpadmin sambashare lxd"
 
 # add additional user account
 if [ -n "$username" ]; then
-	$ROOTCMD adduser --disabled-login --gecos "$username user" $username
+	$ROOTCMD adduser --disabled-login --gecos "$username" $username
 	$ROOTCMD usermod -p "$USERPW" $username
 
 	for g in $groups; do

roles/fai/tasks/fai-profiles.yml

@@ -13,15 +13,7 @@
     mode: push
     delete: yes
     recursive: yes
-  register: fai_profiles
-
-- name: create directory for apt proxy settings
-  file:
-    path: "{{ fai_configdir }}/files/etc/apt/apt.conf.d/00-proxy"
-    state: directory
-    owner: root
-    group: root
-    mode: u=rwx,g=rx,o=rx
+  notify: pack fai-config
 
 - name: Set APT proxy
   template:
@@ -30,9 +22,27 @@
     owner: root
     group: root
     mode: u=rw,g=r,o=r
-  register: fai_profiles_apt_proxy
+  notify: pack fai-config
 
-- name: pack fai configuration
-  shell: "tar -C {{ fai_configdir }} -cf {{ fai_download_dir }}/{{ fai_profiles_archive }} ."
-  when: "fai_profiles.changed or fai_profiles_apt_proxy.changed"
+- name: Set fai provision vars for HW4F profile
+  copy:
+    content: |
+      # set time
+      UTC=yes
+      TIMEZONE=Europe/Berlin
+
+      # some install parameters
+      STOP_ON_ERROR=700
+      MAXPACKAGES=800
+
+      KEYMAP=de-latin1-nodeadkeys
+
+      # start user and password
+      username={{fai_hw4f_profile_username}}
+      USERPW='{{fai_hw4f_profile_password |password_hash("sha512")}}'
+    dest: "{{ fai_configdir }}/class/HW4F_DESKTOP.var"
+    owner: root
+    group: root
+    mode: u=rw,g=r,o=r
+  notify: pack fai-config