diff --git a/libreschool-adminusers.spec b/libreschool-adminusers.spec index f962546..e1c124d 100644 --- a/libreschool-adminusers.spec +++ b/libreschool-adminusers.spec @@ -1,6 +1,6 @@ Summary: LibreSchool Client Local Admin Users Name: libreschool-adminusers -Version: 1.0.1 +Version: 1.0.2 Release: 1.ns7 License: GPL BuildArch: noarch @@ -36,6 +36,7 @@ echo "%doc COPYING" >> %{name}-%{version}-%{release} %post /etc/e-smith/events/actions/initialize-default-databases /sbin/e-smith/expand-template /etc/ansible/reconfigure_clients.yml +/sbin/e-smith/expand-template /srv/ipxe/default_preseed.txt %postun #if [ "$1" = 1 ]; then @@ -45,9 +46,14 @@ if [ "$1" = 0 ]; then #uninstallation /sbin/e-smith/db configuration delete adminusers /sbin/e-smith/expand-template /etc/ansible/reconfigure_clients.yml + /sbin/e-smith/expand-template /srv/ipxe/default_preseed.txt fi %changelog +* Mon Mar 30 2020 Paolo Asperti - 1.0.2-1.ns7 +- Added full name +- Support for libreschool-pxeserver + * Sun Mar 8 2020 Paolo Asperti - 1.0.1-1.ns7 - First round of fixes diff --git a/root/etc/ansible/roles/adminusers/tasks/main.yml b/root/etc/ansible/roles/adminusers/tasks/main.yml index 5c69b73..b41b6cb 100644 --- a/root/etc/ansible/roles/adminusers/tasks/main.yml +++ b/root/etc/ansible/roles/adminusers/tasks/main.yml @@ -4,6 +4,7 @@ user: name: "{{ esmith.adminusers.username }}" groups: adm,cdrom,sudo,dip,plugdev,lpadmin,sambashare + comment: "{{ esmith.adminusers.fullname }}" append: yes state: present diff --git a/root/etc/e-smith/db/configuration/defaults/adminusers/fullname b/root/etc/e-smith/db/configuration/defaults/adminusers/fullname new file mode 100644 index 0000000..5d24291 --- /dev/null +++ b/root/etc/e-smith/db/configuration/defaults/adminusers/fullname @@ -0,0 +1 @@ +LibreSchool Administrator \ No newline at end of file diff --git a/root/etc/e-smith/templates/srv/ipxe/default_preseed.txt/20DefaultUserOverride b/root/etc/e-smith/templates/srv/ipxe/default_preseed.txt/20DefaultUserOverride new file mode 100644 index 0000000..641023a --- /dev/null +++ b/root/etc/e-smith/templates/srv/ipxe/default_preseed.txt/20DefaultUserOverride @@ -0,0 +1,23 @@ +# +# 20DefaultUserOverride +# +# This overrides the default admin user of a fresh installation +{ + $userfullname = ${'adminusers'}{fullname} || 'LibreSchool Administrator'; + $username = ${'adminusers'}{username} || 'libreschool'; + $password = ${'adminusers'}{password} || ''; + + if ( $password ne '' ) { + $OUT .= <