From: Ullli Date: Fri, 20 Mar 2026 10:55:36 +0000 (+0100) Subject: diverse Ergänzungen X-Git-Url: https://freie-schul-it.de/gitweb/fsit_cmgt.git/commitdiff_plain/9ed1e1249509f73e3e6df258d3b3af0e03174e25?hp=3ed18c0d254a590fae9eefa873ce2637b589ef18 diverse Ergänzungen - lid close poweroff inkl Handler - Installation von Software - Reboot Handler --- diff --git a/defaults/main.yml b/defaults/main.yml index 009096c..fc90fe1 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -5,6 +5,7 @@ fsit_cmgt_inventory: fsit_cmgt_benutzername: fsit_cmgt_kommentar: fsit_cmgt_is_sudoer: false +fsit_cmgt_lid_close_poweroff: true fsit_cmgt_printserver: # firefox fsit_cmgt_blocked_install_message: Bitte wende Dich an den Support. diff --git a/handlers/main.yml b/handlers/main.yml index 4070444..581d247 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -3,3 +3,6 @@ ansible.builtin.service: name: fusioninventory-agent.service state: restarted +- name: fsit_cmgt_reboot + ansible.builtin.reboot: + msg: "Reboot initiated by Ansible" diff --git a/tasks/lid_close_poweroff.yml b/tasks/lid_close_poweroff.yml new file mode 100644 index 0000000..22aaea3 --- /dev/null +++ b/tasks/lid_close_poweroff.yml @@ -0,0 +1,18 @@ +--- +- name: remove suspend and standby for notebooks using nfs over wlan + ansible.builtin.command: systemctl mask sleep.target suspend.target hibernate.target hybrid-sleep.target + when: fsit_cmgt_lid_close_poweroff +- name: overwrite settings in /etc/systemd/logind.conf + ansible.lineinfile: + path: /etc/systemd/logind.conf + regex: "^#HandleLidSwitch=.*" + line: "HandleLidSwitch=poweroff" + when: fsit_cmgt_lid_close_poweroff + notify: fsit_cmgt_reboot +- name: overwrite settings in /etc/systemd/logind.conf + ansible.lineinfile: + path: /etc/systemd/logind.conf + regex: "^#HandleLidSwitchExternalPower=.*" + line: "HandleLidSwitchExternalPower=poweroff" + when: fsit_cmgt_lid_close_poweroff + notify: fsit_cmgt_reboot diff --git a/tasks/main.yml b/tasks/main.yml index 3807671..af7d97f 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -8,6 +8,8 @@ ansible.builtin.include_tasks: add_user.yml - name: Include printserver ansible.builtin.include_tasks: printserver.yml +- name: Include software + ansible.builtin.include_tasks: software.yml - name: Include app-settings ansible.builtin.include_tasks: app-settings.yml - name: Include inventory (last task) diff --git a/tasks/software.yml b/tasks/software.yml new file mode 100644 index 0000000..44eb32e --- /dev/null +++ b/tasks/software.yml @@ -0,0 +1,12 @@ +--- +- name: Include vars + ansible.builtin.include_vars: + file: all.yml +- name: Include vars + ansible.builtin.include_vars: + file: "{{ item }}.yml" + loop: group_names +- name: Install list of packages + ansible.builtin.apt: + pkg: "{{ fsit_cmgt_software_alle + fsit_cmgt_software }}" + diff --git a/vars/all.yml b/vars/all.yml new file mode 100644 index 0000000..b14ad4c --- /dev/null +++ b/vars/all.yml @@ -0,0 +1,6 @@ +--- +fsit_cmgt_repos_alle: [] +fsit_cmgt_software_alle: + - thunderbird + - pdfarranger + - stellarium diff --git a/vars/buero.yml b/vars/buero.yml new file mode 100644 index 0000000..88439a3 --- /dev/null +++ b/vars/buero.yml @@ -0,0 +1,3 @@ +--- +fsit_cmgt_repos: [] +fsit_cmgt_software: [] diff --git a/vars/medienraum.yml b/vars/medienraum.yml new file mode 100644 index 0000000..16a2876 --- /dev/null +++ b/vars/medienraum.yml @@ -0,0 +1,7 @@ +--- +fsit_cmgt_repos: [] +fsit_cmgt_software: + - shotcut + - pencil2d + - obs-studio + - minetest