From 9292f3002e95e2ae7e45b8103e8afe260d5ba5d9 Mon Sep 17 00:00:00 2001 From: Alexander Gabriel Date: Sun, 19 Apr 2026 15:01:17 +0200 Subject: [PATCH] =?UTF-8?q?aufger=C3=A4umt=20und=20umgestellt=20von=20push?= =?UTF-8?q?=20auf=20pull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin.sls | 19 +++++++++++++++++++ all.sls | 39 +++++++++++++++++++++++++++++++++++++++ befehle.txt | 36 +++++++----------------------------- core.sls | 6 ++++++ desktop.sls | 3 +++ files/startup_states.conf | 3 +++ init.sls | 2 ++ laptop.sls | 0 pcs.sls | 35 ----------------------------------- test.sls | 15 +++++++++++++++ top.sls | 16 ++++++++++++++-- zz_befehle_alt.txt | 35 +++++++++++++++++++++++++++++++++++ 12 files changed, 143 insertions(+), 66 deletions(-) create mode 100644 admin.sls create mode 100644 all.sls create mode 100644 core.sls create mode 100644 desktop.sls create mode 100644 files/startup_states.conf create mode 100644 init.sls create mode 100644 laptop.sls delete mode 100644 pcs.sls create mode 100644 test.sls create mode 100644 zz_befehle_alt.txt diff --git a/admin.sls b/admin.sls new file mode 100644 index 0000000..f196cfe --- /dev/null +++ b/admin.sls @@ -0,0 +1,19 @@ +vscode: + pkg.latest: + - refresh_db: true + +gimp: + pkg.latest: + - refresh_db: true + +git: + pkg.latest: + - refresh_db: true + +7zip: + pkg.latest: + - refresh_db: true + +npp_x64: + pkg.latest: + - refresh_db: true diff --git a/all.sls b/all.sls new file mode 100644 index 0000000..a98b7a2 --- /dev/null +++ b/all.sls @@ -0,0 +1,39 @@ +arduino-ide: + pkg.latest: + - refresh_db: true + +blender: + pkg.latest: + - refresh_db: true + +vscode: + pkg.latest: + - refresh_db: true + +gimp: + pkg.latest: + - refresh_db: true + +git: + pkg.latest: + - refresh_db: true + +adoptium_jre: + pkg.latest: + - refresh_db: true + +openrobertaconnector: + pkg.latest: + - refresh_db: true + +7zip: + pkg.latest: + - refresh_db: true + +vlc: + pkg.latest: + - refresh_db: true + +npp_x64: + pkg.latest: + - refresh_db: true diff --git a/befehle.txt b/befehle.txt index 5f8296f..ce22ef1 100644 --- a/befehle.txt +++ b/befehle.txt @@ -1,35 +1,13 @@ -salt-run winrepo.update_git_repos -salt -G 'os:windows' pkg.refresh_db -salt '*' state.apply - -#salt '*' pkg.install 'firefox_x64' - -cat /srv/salt/states/pcs.sls -firefox_x64: - pkg: - - installed - -salt '*' state.apply pcs -salt '*' state.apply - -salt -G 'os:windows' pkg.refresh_db -salt '*' pkg.install arduino-ide version=2.3.3 - -#noch einbauen -salt '*' cmd.run 'wmic product where "name like \'%Automate%\'" call uninstall /nointeractive' shell=powershell -salt "*" appx.remove *ZuneMusic* - - -# list installed packages salt -G 'os:windows' pkg.list_pkgs -# list available versions -salt win11 pkg.list_available firefox_x64 +salt '*' state.apply init +salt '*' state.apply -#Windows Updates -salt -G 'os:windows' win_wua.available +salt '*' test.version + +salt-run winrepo.update_git_repos + +salt -G 'os:windows' pkg.refresh_db -salt -G 'os:windows' win_wua.download xxxxxxx -salt '*' win_wua.install xxxxxxxxxxxx diff --git a/core.sls b/core.sls new file mode 100644 index 0000000..c054d9e --- /dev/null +++ b/core.sls @@ -0,0 +1,6 @@ +copy_my_files: + file.managed: + - name: C:/ProgramData/Salt Project/Salt/conf/minion.d/startup_states.conf + - source: salt://files/startup_states.conf + - makedirs: True + diff --git a/desktop.sls b/desktop.sls new file mode 100644 index 0000000..7de3231 --- /dev/null +++ b/desktop.sls @@ -0,0 +1,3 @@ +python3_x64: + pkg.latest: + - refresh_db: true diff --git a/files/startup_states.conf b/files/startup_states.conf new file mode 100644 index 0000000..a8f4024 --- /dev/null +++ b/files/startup_states.conf @@ -0,0 +1,3 @@ +startup_states: 'top' +top_file: 'top.sls' + diff --git a/init.sls b/init.sls new file mode 100644 index 0000000..223e5d9 --- /dev/null +++ b/init.sls @@ -0,0 +1,2 @@ +include: + - core diff --git a/laptop.sls b/laptop.sls new file mode 100644 index 0000000..e69de29 diff --git a/pcs.sls b/pcs.sls deleted file mode 100644 index a39f1fb..0000000 --- a/pcs.sls +++ /dev/null @@ -1,35 +0,0 @@ -firefox_x64: - pkg: - - latest - -arduino-ide: - pkg: - - latest - -blender: - pkg: - - latest - -vscode: - pkg: - - latest - -git: - pkg: - - latest - -python3_x64: - pkg: - - latest - -adoptium_jre: - pkg: - - latest - -openrobertaconnector: - pkg: - - latest - -7zip: - pkg: - - latest diff --git a/test.sls b/test.sls new file mode 100644 index 0000000..b0337a9 --- /dev/null +++ b/test.sls @@ -0,0 +1,15 @@ +vscode: + pkg.latest: + - refresh_db: true + +gimp: + pkg.latest: + - refresh_db: true + +7zip: + pkg.latest: + - refresh_db: true + +npp_x64: + pkg.latest: + - refresh_db: true diff --git a/top.sls b/top.sls index a04da46..6dac0c9 100644 --- a/top.sls +++ b/top.sls @@ -1,4 +1,16 @@ base: - '*': - - pcs + 'z-lab-laptop-*': + - core + - all + - laptop + 'z-lab-desktop-*': + - core + - all + - desktop + 'z-lab-admin*': + - core + - admin + 'z-lab-test*': + - core + - test diff --git a/zz_befehle_alt.txt b/zz_befehle_alt.txt new file mode 100644 index 0000000..5f8296f --- /dev/null +++ b/zz_befehle_alt.txt @@ -0,0 +1,35 @@ +salt-run winrepo.update_git_repos +salt -G 'os:windows' pkg.refresh_db +salt '*' state.apply + +#salt '*' pkg.install 'firefox_x64' + +cat /srv/salt/states/pcs.sls +firefox_x64: + pkg: + - installed + +salt '*' state.apply pcs +salt '*' state.apply + +salt -G 'os:windows' pkg.refresh_db +salt '*' pkg.install arduino-ide version=2.3.3 + +#noch einbauen +salt '*' cmd.run 'wmic product where "name like \'%Automate%\'" call uninstall /nointeractive' shell=powershell +salt "*" appx.remove *ZuneMusic* + + +# list installed packages +salt -G 'os:windows' pkg.list_pkgs + +# list available versions +salt win11 pkg.list_available firefox_x64 + +#Windows Updates +salt -G 'os:windows' win_wua.available + +salt -G 'os:windows' win_wua.download xxxxxxx + +salt '*' win_wua.install xxxxxxxxxxxx +