From 317e14eea31944ccaa958828e20e43ca63935738 Mon Sep 17 00:00:00 2001 From: Alexander Gabriel Date: Sat, 7 Nov 2026 21:26:31 +0100 Subject: [PATCH] Zwischenstand --- Notizen.txt | 2 ++ admin.sls | 5 ---- befehle.txt | 7 +++-- kids.sls | 14 +++++++++ test.sls | 29 ++++++++++++++++++- win/repo-ng/cache_version | 1 + win/repo-ng/custom_defs/adoptium_jre/init.sls | 9 ------ win/repo-ng/custom_defs/gcompris/init.sls | 9 ++++++ win/repo-ng/custom_defs/gimp/gimp3.sls | 16 ++++++++++ win/repo-ng/custom_defs/kdenlive/init.sls | 9 ------ win/repo-ng/custom_defs/rustdesk/init.sls | 10 ------- win/repo-ng/remote_map.txt | 2 ++ win/repo/cache_version | 1 + win/repo/remote_map.txt | 2 ++ zz_befehle_alt.txt | 2 ++ 15 files changed, 82 insertions(+), 36 deletions(-) create mode 100644 Notizen.txt create mode 100644 win/repo-ng/cache_version delete mode 100644 win/repo-ng/custom_defs/adoptium_jre/init.sls create mode 100644 win/repo-ng/custom_defs/gcompris/init.sls create mode 100644 win/repo-ng/custom_defs/gimp/gimp3.sls delete mode 100644 win/repo-ng/custom_defs/kdenlive/init.sls delete mode 100644 win/repo-ng/custom_defs/rustdesk/init.sls create mode 100644 win/repo-ng/remote_map.txt create mode 100644 win/repo/cache_version create mode 100644 win/repo/remote_map.txt diff --git a/Notizen.txt b/Notizen.txt new file mode 100644 index 0000000..591f730 --- /dev/null +++ b/Notizen.txt @@ -0,0 +1,2 @@ +https://inkstitch.org/docs/install-windows/ +inkstitch diff --git a/admin.sls b/admin.sls index 2b4c4d4..f54625f 100644 --- a/admin.sls +++ b/admin.sls @@ -3,11 +3,6 @@ vscode: - refresh_db: true - refresh: true -gimp: - pkg.removed: - - refresh_db: true - - refresh: true - gimp: pkg.latest: - refresh_db: true diff --git a/befehle.txt b/befehle.txt index 0d93701..f898ead 100644 --- a/befehle.txt +++ b/befehle.txt @@ -9,14 +9,17 @@ salt-run winrepo.update_git_repos salt -G 'os:windows' pkg.refresh_db + +##################### # test-rechner "C:\program files\salt project\salt\salt-minion" -l debug - salt 'z-lab-test*' pkg.list_pkgs salt 'z-lab-test*' pkg.refresh_db salt 'z-lab-test*' pkg.list_available gimp +salt 'z-lab-test*' pkg.remove 'gimp' +salt 'z-lab-test*' pkg.install 'gimp' version=2.8.14 +salt 'z-lab-test*' pkg.install 'gimp' version=3.2.6 salt 'z-lab-test*' pkg.install 'gimp' version=2.8.14 -salt 'z-lab-test*' pkg.install 'gimp' version=3.2.2.0 salt 'z-lab-test*' pkg.install 'gimp' version=latest salt 'z-lab-test*' pkg.remove 'gimp' diff --git a/kids.sls b/kids.sls index 7a58abb..72b1f3a 100644 --- a/kids.sls +++ b/kids.sls @@ -50,3 +50,17 @@ inkscape: - refresh_db: true - refresh: true +kdenlive: + pkg.latest: + - refresh_db: true + - refresh: true + +freecad: + pkg.latest: + - refresh_db: true + - refresh: true + +gcompris: + pkg.latest: + - refresh_db: true + - refresh: true diff --git a/test.sls b/test.sls index 2900456..35768fd 100644 --- a/test.sls +++ b/test.sls @@ -8,7 +8,34 @@ # - refresh_db: true # - refresh: true -#gimp: +#freecad: # pkg.latest: # - refresh_db: true # - refresh: true + +#freecad: +# pkg.removed: +# - refresh_db: true +# - refresh: true + +#join_to_domain: +# system.join_domain: +# - name: kids.z-lab.local +# - username: agabriel_admin@kids.z-lab.local +# - password: umfkyatL123% +# - restart: True + +#gcompris: +# pkg.latest: +# - refresh_db: true +# - refresh: true + +#inkscape: +# pkg.latest: +# - refresh_db: true +# - refresh: true + +gimp: + pkg.latest: + - refresh_db: true + - refresh: true diff --git a/win/repo-ng/cache_version b/win/repo-ng/cache_version new file mode 100644 index 0000000..319ff4b --- /dev/null +++ b/win/repo-ng/cache_version @@ -0,0 +1 @@ +3008.3 \ No newline at end of file diff --git a/win/repo-ng/custom_defs/adoptium_jre/init.sls b/win/repo-ng/custom_defs/adoptium_jre/init.sls deleted file mode 100644 index 94e6199..0000000 --- a/win/repo-ng/custom_defs/adoptium_jre/init.sls +++ /dev/null @@ -1,9 +0,0 @@ -adoptium_jre: - '11.0.26.4': - full_name: 'Eclipse Temurin JRE mit Hotspot 11.0.26+4 (x64)' - installer: 'https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.26%2B4/OpenJDK11U-jre_x64_windows_hotspot_11.0.26_4.msi' - install_flags: '/qn /norestart ADDLOCAL=ALL' - uninstall_flags: '/qn /norestart' - msiexec: True - locale: en_US - reboot: False diff --git a/win/repo-ng/custom_defs/gcompris/init.sls b/win/repo-ng/custom_defs/gcompris/init.sls new file mode 100644 index 0000000..bd4404a --- /dev/null +++ b/win/repo-ng/custom_defs/gcompris/init.sls @@ -0,0 +1,9 @@ +gcompris: + '26.1': + full_name: 'gcompris' + installer: 'https://download.kde.org/stable/gcompris/qt/windows/gcompris-qt-26.1-win64-gcc.exe' + install_flags: '/S' + uninstall_flags: '/S' + uninstaller: '%ProgramFiles(x86)%\GCompris-Qt\Uninstall.exe' + locale: de_DE + reboot: False diff --git a/win/repo-ng/custom_defs/gimp/gimp3.sls b/win/repo-ng/custom_defs/gimp/gimp3.sls new file mode 100644 index 0000000..fa4f1d6 --- /dev/null +++ b/win/repo-ng/custom_defs/gimp/gimp3.sls @@ -0,0 +1,16 @@ +# GIMP 3.x: one installer for x86, x64 and arm64, installs into %ProgramFiles%\GIMP 3 +gimp__: + {% for major_version, version, installed_version, minor_version in [('v3.2', '3.2.6', '3.2.6.0', ''), + ('v3.2', '3.2.4', '3.2.4.0', ''), + ('v3.2', '3.2.2', '3.2.2.0', ''), + ('v3.2', '3.2.0', '3.2.0.0', '')] %} + '{{ installed_version }}': + full_name: 'GIMP {{ version }}' + installer: 'https://download.gimp.org/mirror/pub/gimp/{{ major_version }}/windows/gimp-{{ version }}-setup{{ minor_version }}.exe' + install_flags: '/SP- /VERYSILENT /NORESTART /ALLUSERS' + uninstaller: '%ProgramFiles%\GIMP 3\uninst\unins000.exe' + uninstall_flags: '/SP- /VERYSILENT /NORESTART' + msiexec: False + locale: en_US + restart: False + {% endfor %} diff --git a/win/repo-ng/custom_defs/kdenlive/init.sls b/win/repo-ng/custom_defs/kdenlive/init.sls deleted file mode 100644 index 01b1064..0000000 --- a/win/repo-ng/custom_defs/kdenlive/init.sls +++ /dev/null @@ -1,9 +0,0 @@ -kdenlive: - '25.12.3': - full_name: 'kdenlive' - installer: 'https://download.kde.org/stable/kdenlive/25.12/windows/kdenlive-25.12.3.exe' - install_flags: '/S' - uninstall_flags: '/S' - uninstaller: '%ProgramFiles%\kdenlive\uninstall.exe' - locale: de_DE - reboot: False diff --git a/win/repo-ng/custom_defs/rustdesk/init.sls b/win/repo-ng/custom_defs/rustdesk/init.sls deleted file mode 100644 index d853d90..0000000 --- a/win/repo-ng/custom_defs/rustdesk/init.sls +++ /dev/null @@ -1,10 +0,0 @@ -rustdesk: - '1.4.6': - full_name: 'RustDesk' - installer: 'https://github.com/rustdesk/rustdesk/releases/download/1.4.6/rustdesk-1.4.6-x86_64.exe' - install_flags: ' --silent-install' - uninstall_flags: ' --uninstall' - uninstaller: '%ProgramFiles%\\RustDesk\RustDesk.exe' - msiexec: False - locale: de_DE - reboot: False diff --git a/win/repo-ng/remote_map.txt b/win/repo-ng/remote_map.txt new file mode 100644 index 0000000..1ab2317 --- /dev/null +++ b/win/repo-ng/remote_map.txt @@ -0,0 +1,2 @@ +# winrepo_remote map as of 12 Oct 2026 22:21:04.825917 +salt-winrepo-ng = https://github.com/saltstack/salt-winrepo-ng.git diff --git a/win/repo/cache_version b/win/repo/cache_version new file mode 100644 index 0000000..319ff4b --- /dev/null +++ b/win/repo/cache_version @@ -0,0 +1 @@ +3008.3 \ No newline at end of file diff --git a/win/repo/remote_map.txt b/win/repo/remote_map.txt new file mode 100644 index 0000000..71e2e32 --- /dev/null +++ b/win/repo/remote_map.txt @@ -0,0 +1,2 @@ +# winrepo_remote map as of 12 Oct 2026 22:20:18.591139 +salt-winrepo = https://github.com/saltstack/salt-winrepo.git diff --git a/zz_befehle_alt.txt b/zz_befehle_alt.txt index 5f8296f..9b9d3b5 100644 --- a/zz_befehle_alt.txt +++ b/zz_befehle_alt.txt @@ -33,3 +33,5 @@ salt -G 'os:windows' win_wua.download xxxxxxx salt '*' win_wua.install xxxxxxxxxxxx +salt-run manage.up +salt-run manage.down \ No newline at end of file