diff --git a/lmn-desktop.yml b/lmn-desktop.yml index b904a2d..87e6aef 100644 --- a/lmn-desktop.yml +++ b/lmn-desktop.yml @@ -24,6 +24,9 @@ vars: domain: "{{ ansible_domain }}" kerberize_uris: qgm.lan + realm: QGM.LAN + serverhostname: server + smb_server: server apt_conf: Acquire::http::Proxy "http://netboot.qgm.lan:3142/"; ntp_serv: server.qgm.lan proxy: http://firewall.qgm.lan:3128 @@ -62,5 +65,5 @@ - lmn_mount - lmn_kde - lmn_qgm - #- lmn_printer + - lmn_printer #- kerberize diff --git a/qgm-desktop.yml b/qgm-desktop.yml index bc3595f..434611b 100644 --- a/qgm-desktop.yml +++ b/qgm-desktop.yml @@ -8,6 +8,9 @@ vars: domain: "{{ ansible_domain }}" kerberize_uris: qgm.lan + realm: QGM.LAN + serverhostname: server + smb_server: server apt_conf: Acquire::http::Proxy "http://netboot.qgm.lan:3142/"; ntp_serv: server.qgm.lan proxy: http://firewall.qgm.lan:3128 @@ -44,5 +47,5 @@ #- lmn_mount #- lmn_kde - lmn_qgm ## school specific customization - #- lmn_printer + - lmn_printer #- kerberize diff --git a/roles/lmn_printer/defaults/main.yml b/roles/lmn_printer/defaults/main.yml deleted file mode 100644 index cf3a823..0000000 --- a/roles/lmn_printer/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -smb_server: "server" -smb_share: "default-school/" diff --git a/roles/lmn_printer/files/90-lmn-sudotools b/roles/lmn_printer/files/90-lmn-sudotools index 1c82b4d..71c0e99 100644 --- a/roles/lmn_printer/files/90-lmn-sudotools +++ b/roles/lmn_printer/files/90-lmn-sudotools @@ -1,4 +1,3 @@ %examusers ALL=(root) NOPASSWD: /usr/share/linuxmuster-linuxclient7/scripts/sudoTools %role-student ALL=(root) NOPASSWD: /usr/share/linuxmuster-linuxclient7/scripts/sudoTools %role-teacher ALL=(root) NOPASSWD: /usr/share/linuxmuster-linuxclient7/scripts/sudoTools - diff --git a/roles/lmn_printer/templates/network.conf.j2 b/roles/lmn_printer/templates/network.conf.j2 index 5cd39ce..f7eaeca 100644 --- a/roles/lmn_printer/templates/network.conf.j2 +++ b/roles/lmn_printer/templates/network.conf.j2 @@ -1,5 +1,5 @@ [network] -serverHostname = server -domain = pn.steinbeis.schule -realm = PN.STEINBEIS.SCHULE +serverHostname = {{ serverhostname }} +domain = {{ domain }} +realm = {{ realm }} version = 1 diff --git a/roles/lmn_qgm/tasks/main.yml b/roles/lmn_qgm/tasks/main.yml index 9e91036..21d9804 100644 --- a/roles/lmn_qgm/tasks/main.yml +++ b/roles/lmn_qgm/tasks/main.yml @@ -1,4 +1,12 @@ --- +- name: Enable passwordless sudo access for user ansible + lineinfile: + path: /etc/sudoers + state: present + regexp: '^ansible ALL=' + line: 'ansible ALL=(ALL) NOPASSWD: ALL' + validate: '/usr/sbin/visudo -cf %s' + - name: Preseed ttf-mscorefonts-installer ansible.builtin.debconf: name: ttf-mscorefonts-installer @@ -70,9 +78,13 @@ action/lock_screen=false action/start_new_session=false +- name: Disable screen locking + ansible.builtin.copy: + dest: /etc/xdg/kscreenlockerrc + content: | [Daemon][$i] - AutoLock=false - LockonResume=false + Autolock=false + LockOnResume=false - name: Download greenfoot/bluej ansible.builtin.get_url: