diff --git a/ansible.cfg b/ansible.cfg new file mode 100644 index 0000000..152634f --- /dev/null +++ b/ansible.cfg @@ -0,0 +1,7 @@ +[defaults] +host_key_checking = False +timeout = 20 +retry_files_save_path = /home/ansible/retry/ +# Do not put more jobs here, or ssh will fail +# Anything more than 10 kills this poor server +forks = 5 diff --git a/lmn-laptop.yml b/lmn-laptop.yml index db84c49..9cddfaf 100644 --- a/lmn-laptop.yml +++ b/lmn-laptop.yml @@ -49,5 +49,6 @@ - up2date_debian - lmn_kde - lmn_qgm + - lmn_qgsoftware - lmn_qgsddm - lmn_qglaptop diff --git a/qgm-desktop.yml b/qgm-desktop.yml index ebca43c..9ab3f51 100644 --- a/qgm-desktop.yml +++ b/qgm-desktop.yml @@ -2,6 +2,7 @@ --- - name: apply configuration to the machines hosts: all + serial: 5 remote_user: ansible become: yes @@ -45,7 +46,7 @@ roles: - lmn_network - #- up2date_debian + - up2date_debian - lmn_sssd - lmn_mount - lmn_kde @@ -170,5 +171,7 @@ ansiblehost={{ ansible_hostname }} dest: /etc/ansible_timestamp.txt - - + - name: Menueuntrag "als Hintergrundbild festelegen" in Dolphin entfernen + ansible.builtin.file: + path: /usr/share/kio/servicemenus/setaswallpaper.desktop + state: absent diff --git a/roles/lmn_qgm/files/qgm-login.sh b/roles/lmn_qgm/files/qgm-login.sh index e34a982..2303abc 100644 --- a/roles/lmn_qgm/files/qgm-login.sh +++ b/roles/lmn_qgm/files/qgm-login.sh @@ -5,7 +5,10 @@ DESKDIR=$(xdg-user-dir DESKTOP) echo $DESKDIR >> /tmp/login.log # Wallpaper -kwriteconfig5 --file "$HOME/.config/plasma-org.kde.plasma.desktop-appletsrc" --group 'Containments' --group '1' --group 'Wallpaper' --group 'org.kde.image' --group 'General' --key 'Image' "/usr/local/share/qgm/qgm_background_wallpaper.jpg" || return +chmod u+x "$HOME/.config/plasma-org.kde.plasma.desktop-appletsrc" +kwriteconfig5 --file "$HOME/.config/plasma-org.kde.plasma.desktop-appletsrc" --group 'Containments' --group '1' --group 'Wallpaper' --group 'org.kde.image' --group 'General' --key 'Image' "/usr/local/share/qgm/qgm_background_wallpaper.jpg" || return +# DiscoverButton löschen funzt noch nicht +kwriteconfig5 --file "$HOME/.config/plasma-org.kde.plasma.desktop-appletsrc" --group 'Containments' --group '2' --group 'Applets' --group '5' --group 'Configuration' --group 'General' --key 'launchers' "applications:systemsettings.desktop,preferred://filemanager,preferred://browser" || return # Beamer-Icon rm -f $DESKDIR/qgm-beamersetup.desktop diff --git a/roles/lmn_qgm/tasks/base.yml b/roles/lmn_qgm/tasks/base.yml index d705bd9..be45710 100644 --- a/roles/lmn_qgm/tasks/base.yml +++ b/roles/lmn_qgm/tasks/base.yml @@ -68,6 +68,8 @@ - kdenlive - terminator - geany + - minder + - freeplane autoremove: true state: latest environment: @@ -101,7 +103,7 @@ copy: src: files/qgm-login.sh dest: /etc/profile.d/qgm-login.sh - mode: '0644' + mode: '0664' owner: root group: root diff --git a/roles/lmn_qgm/tasks/beamerscript.yml b/roles/lmn_qgm/tasks/beamerscript.yml index bc3f80e..f232718 100644 --- a/roles/lmn_qgm/tasks/beamerscript.yml +++ b/roles/lmn_qgm/tasks/beamerscript.yml @@ -20,7 +20,7 @@ - name: Copy icon copy: - src: beamer.png + src: files/beamer.png dest: /usr/share/icons/beamer.png mode: '0644' owner: root diff --git a/roles/lmn_qgm/tasks/main.yml b/roles/lmn_qgm/tasks/main.yml index d4da06d..a0974c4 100644 --- a/roles/lmn_qgm/tasks/main.yml +++ b/roles/lmn_qgm/tasks/main.yml @@ -11,4 +11,4 @@ - name: Copy Beamerscript to lt- hosts import_tasks: file: beamerscript.yml - when: "'lt-' in inventory_hostname" + when: "'lt-' in inventory_hostname" diff --git a/roles/lmn_qgsddm/files/qgm_background.jpg b/roles/lmn_qgsddm/files/qgm_background.jpg index a7f1314..93078e3 100644 Binary files a/roles/lmn_qgsddm/files/qgm_background.jpg and b/roles/lmn_qgsddm/files/qgm_background.jpg differ diff --git a/roles/lmn_qgsddm/files/qgm_background_wallpaper.jpg b/roles/lmn_qgsddm/files/qgm_background_wallpaper.jpg index 991ef13..958c1a6 100644 Binary files a/roles/lmn_qgsddm/files/qgm_background_wallpaper.jpg and b/roles/lmn_qgsddm/files/qgm_background_wallpaper.jpg differ diff --git a/roles/lmn_qgsoftware/files/qg.appimage.ArduinoIDE2.desktop b/roles/lmn_qgsoftware/files/qg.appimage.ArduinoIDE2.desktop index f498c8f..b66063b 100644 --- a/roles/lmn_qgsoftware/files/qg.appimage.ArduinoIDE2.desktop +++ b/roles/lmn_qgsoftware/files/qg.appimage.ArduinoIDE2.desktop @@ -2,7 +2,7 @@ Name=Arduino IDE2 AppImage Comment=Open-source electronics prototyping platform GenericName=Arduino IDE -Exec=unset -v https_proxy http_proxy && . /opt/appimages/arduino2/start-arduino2-appimage %f > /tmp/arduinoAppimage.log 2>&1 +Exec=unset -v https_proxy http_proxy && . /opt/appimages/arduino2/start-arduino2-appimage %f > /tmp/arduinoAppimage$(date +%Y%m%d%H%M%S).log 2>&1 Icon=arduino Type=Application Terminal=false diff --git a/vars-qgsoftware.yml b/vars-qgsoftware.yml index 7173e2f..5d503a3 100644 --- a/vars-qgsoftware.yml +++ b/vars-qgsoftware.yml @@ -1,7 +1,7 @@ #### Bluej/Greenfoot ## Bluej/Greenfoot Versionen ## Für Updates anpassen -bluej_target_version: "5.4.2" +bluej_target_version: "5.5.0" greenfoot_target_version: "3.9.0" ## -- greenfoot_src_uri: https://www.greenfoot.org/download/files/Greenfoot-linux-x64-VERSION.deb