diff --git a/.Netcore_datacube.sls.swp b/.Netcore_datacube.sls.swp deleted file mode 100644 index 76d79d2..0000000 Binary files a/.Netcore_datacube.sls.swp and /dev/null differ diff --git a/ConfManIob.sls b/ConfManIob.sls new file mode 100644 index 0000000..734eab0 --- /dev/null +++ b/ConfManIob.sls @@ -0,0 +1,26 @@ +## Script inizio update (copia conf + kill) +#WinUpdStart: +# cmd.script: +# - name: c:/Steamware/src/IobUpdStart.bat +# - source: salt://IobUpdStart.bat + +# download ConfigMan.IOB +download-ConfManIOB: + file.managed: + - name: c:/Steamware/ConfMan.IOB/ConfMan.IOB.CApp.exe + - source: https://nexus.steamware.net/repository/utility/ConfMan.IOB/ConfMan.IOB.CApp.exe + - makedirs: True + - source_hash: https://nexus.steamware.net/repository/utility/ConfMan.IOB/ConfMan.IOB.CApp.exe.md5 + +download-ConfManIOB-yaml: + file.managed: + - name: c:/Steamware/ConfMan.IOB/conf.yaml + - source: https://nexus.steamware.net/repository/utility/ConfMan.IOB/conf.yaml + - makedirs: True + - source_hash: https://nexus.steamware.net/repository/utility/ConfMan.IOB/conf.yaml.md5 + +## Script fine update (restore conf + lock remove) +#ManUpdStop: +# cmd.script: +# - name: c:/Steamware/src/IobUpdStop.bat +# - source: salt://IobUpdStop.bat diff --git a/IobMan.sls b/IobMan.sls index 9f723ab..ce04bc9 100644 --- a/IobMan.sls +++ b/IobMan.sls @@ -1,29 +1,28 @@ -# download + unzip di IOB-MAN +## Script inizio update (copia conf + kill) +#ManUpdStart: +# cmd.script: +# - name: c:/Steamware/src/IobUpdStart.bat; exit 0 +# - source: salt://IobUpdStart.bat +# download + unzip di IOB-MAN download-IOB-MAN: file.managed: - name: c:/Steamware/src/IOB-MAN.zip - - source: http://nexus.steamware.net/repository/utility/MAPO/IOB-MAN/stable/IOB-MAN.zip - makedirs: True - - source_hash: http://nexus.steamware.net/repository/utility/MAPO/IOB-MAN/stable/IOB-MAN.zip.md5 - -# Script inizio update (copia conf + kill) -ManUpdStart: - cmd.script: - - name: c:/Steamware/src/IobUpdStart.bat; exit 0 - - source: salt://IobUpdStart.bat + - source: https://nexus.steamware.net/repository/utility/MAPO/IOB-MAN/stable/IOB-MAN.zip + - source_hash: https://nexus.steamware.net/repository/utility/MAPO/IOB-MAN/stable/IOB-MAN.zip.md5 # Ora estraggo files in directory... extract-IOB-MAN: archive.extracted: - name: c:\Steamware\IOB-MAN\ - source: c:/Steamware/src/IOB-MAN.zip - - source_hash: http://nexus.steamware.net/repository/utility/MAPO/IOB-MAN/stable/IOB-MAN.zip.md5 + - source_hash: https://nexus.steamware.net/repository/utility/MAPO/IOB-MAN/stable/IOB-MAN.zip.md5 - enforce_toplevel: False - overwrite: True -# Script fine update (restore conf + lock remove) -ManUpdStop: - cmd.script: - - name: c:/Steamware/src/IobUpdStop.bat - - source: salt://IobUpdStop.bat +## Script fine update (restore conf + lock remove) +#ManUpdStop: +# cmd.script: +# - name: c:/Steamware/src/IobUpdStop.bat +# - source: salt://IobUpdStop.bat diff --git a/IobUpdStart.bat b/IobUpdStart.bat index a47580a..55e7e99 100644 --- a/IobUpdStart.bat +++ b/IobUpdStart.bat @@ -46,6 +46,8 @@ taskkill /IM "firefox.exe" /F || GOTO:4 :4 taskkill /IM "geckodriver.exe" /F || GOTO:5 :5 +taskkill /IM "chromedriver.exe" /F || GOTO:6 +:6 taskkill /IM "IOB-WIN-NEXT.exe" /F || GOTO:END :END diff --git a/IobUpdStart.bat_0422 b/IobUpdStart.bat_0422 deleted file mode 100644 index 4887c3b..0000000 --- a/IobUpdStart.bat_0422 +++ /dev/null @@ -1,25 +0,0 @@ -REM Recupero dataora -set mydate=%date:~10,4%-%date:~4,2%-%date:~7,2% -REM Indico update in esecuzione da file... -echo > c:\Steamware\IOB-MAN\update.run -REM Per sicurezza faccio copio del file di config anche IOB vecchio... - -robocopy c:\Steamware\IOB-WIN-NEXT\DATA\CONF c:\Steamware\src\IOB-WIN-NEXT\CONF /MIR || GOTO:END -copy /Y c:\Steamware\IOB-MAN\CONF\process.json c:\Steamware\src\process.json || GOTO:END -robocopy c:\Steamware\IOB-WIN\DATA\CONF c:\Steamware\src\IOB-WIN\CONF /MIR || GOTO:1 - -REM chiudo i task in esecuzione -:1 -taskkill /IM "IOB-WIN-NEXT.exe" /F || GOTO:2 -:2 -taskkill /IM "IOB-MAN.exe" /F || GOTO:3 -:3 -taskkill /IM "firefox.exe" /F || GOTO:4 -:4 -taskkill /IM "geckodriver.exe" /F || GOTO:5 -:5 -taskkill /IM "IOB-WIN-NEXT.exe" /F || GOTO:END - -:END - -TIMEOUT 3 diff --git a/IobUpdStart.bat_150422 b/IobUpdStart.bat_150422 deleted file mode 100644 index a1d3e9f..0000000 --- a/IobUpdStart.bat_150422 +++ /dev/null @@ -1,57 +0,0 @@ -@REM Recupero dataora -@set mydate=%date:~10,4%-%date:~4,2%-%date:~7,2% - -@REM Indico update in esecuzione da file... -@echo > c:\Steamware\IOB-MAN\update.run - -@REM echo "se esiste file di errore copia configurazione lo cancello..." -@REM if not exist c:\Steamware\IOB-MAN\update.err goto COPIA -@REM DEL c:\Steamware\IOB-MAN\update.err - -:COPIA -@ECHO . -@ECHO ">>> Salvo Configurazione, per sicurezza faccio copia del file di config anche IOB vecchio..." - -ROBOCOPY c:\Steamware\IOB-WIN-NEXT\DATA\CONF c:\Steamware\src\IOB-WIN-NEXT\CONF /MIR && GOTO:NEXT1 || GOTO:MSGERR1 -:MSGERR1 -SET ERR=1 -@ECHO "." -@ECHO "<<<< ATTENZIONE! >>>>> ERRORE COPIA FILE DI CONFIGURAZIONE WIN ..." -:NEXT1 - -copy /Y c:\Steamware1\IOB-MAN\CONF\process.json c:\Steamware\src\process.json && GOTO:NEXT2 || GOTO:MSGERR2 -:MSGERR2 -SET ERR=2 -@ECHO "." -@ECHO "<<<< ATTENZIONE! >>>>> ERRORE COPIA FILE DI CONFIGURAZIONE MAN ..." -:NEXT2 - -@REM vecchia versione potrebbe non essere presente quindi proseguo cmq se in errore... -ROBOCOPY c:\Steamware\IOB-WIN\DATA\CONF c:\Steamware\src\IOB-WIN\CONF /MIR - -REM chiudo i task in esecuzione -:1 -taskkill /IM "IOB-WIN-NEXT.exe" /F || GOTO:2 -:2 -taskkill /IM "IOB-MAN.exe" /F || GOTO:3 -:3 -taskkill /IM "firefox.exe" /F || GOTO:4 -:4 -taskkill /IM "geckodriver.exe" /F || GOTO:5 -:5 -taskkill /IM "IOB-WIN-NEXT.exe" /F || GOTO:END - -:END - -@REM Se c'è errore di copia configurazione faccio copia ulteriore... -IF %ERR% GTR 1 GOTO:ERR - -TIMEOUT 3 -EXIT - -:ERR -REM tento altra copia... -@rem echo > c:\Steamware\IOB-MAN\update.err - -COPY c:\Steamware\IOB-WIN-NEXT\DATA\CONF c:\Steamware\src\Salt_Err\ -COPY c:\Steamware\IOB-MAN\CONF\process.json c:\Steamware\src\Salt_Err\ diff --git a/IobUpdStart.sls b/IobUpdStart.sls new file mode 100644 index 0000000..423000f --- /dev/null +++ b/IobUpdStart.sls @@ -0,0 +1,5 @@ +# Script inizio update (copia conf + kill) +ManUpdStart: + cmd.script: + - name: c:/Steamware/src/IobUpdStart.bat; exit 0 + - source: salt://IobUpdStart.bat diff --git a/IobUpdStop.sls b/IobUpdStop.sls new file mode 100644 index 0000000..761c794 --- /dev/null +++ b/IobUpdStop.sls @@ -0,0 +1,5 @@ +# Script fine update (restore conf + lock remove) +ManUpdStop: + cmd.script: + - name: c:/Steamware/src/IobUpdStop.bat + - source: salt://IobUpdStop.bat diff --git a/IobWinData.sls b/IobWinData.sls index 03aa735..85f2626 100644 --- a/IobWinData.sls +++ b/IobWinData.sls @@ -1,16 +1,16 @@ download-IOB-WIN-DATA: file.managed: - name: c:/Steamware/src/DATA.zip - - source: http://nexus.steamware.net/repository/utility/MAPO/IOB-WIN/DATA.zip + - source: http://nexus.steamware.net/repository/utility/MAPO/IOB-WIN-DATA/DATA.zip - makedirs: True - - source_hash: http://nexus.steamware.net/repository/utility/MAPO/IOB-WIN/DATA.md5 + - source_hash: http://nexus.steamware.net/repository/utility/MAPO/IOB-WIN-DATA/DATA.md5 # NON da ripetere poichè personalizzato x singola install... e NON LO RIFA' se non si cambia file su nexus extract-IOB-WIN-DATA: archive.extracted: - name: c:\Steamware\IOB-WIN - source: c:/Steamware/src/DATA.zip - - source_hash: http://nexus.steamware.net/repository/utility/MAPO/IOB-WIN/DATA.md5 + - source_hash: http://nexus.steamware.net/repository/utility/MAPO/IOB-WIN-DATA/DATA.md5 #- skip_verify: True - enforce_toplevel: False diff --git a/IobWin.sls b/IobWinLegacy.sls similarity index 100% rename from IobWin.sls rename to IobWinLegacy.sls diff --git a/IobWinNext.sls b/IobWinNext.sls index 6c7d9cc..1da8f9a 100644 --- a/IobWinNext.sls +++ b/IobWinNext.sls @@ -1,3 +1,9 @@ +## Script inizio update (copia conf + kill) +#WinUpdStart: +# cmd.script: +# - name: c:/Steamware/src/IobUpdStart.bat +# - source: salt://IobUpdStart.bat + download-IOB-WIN-NEXT: file.managed: - name: c:/Steamware/src/MAPO-IOB-WIN-NEXT.zip @@ -5,13 +11,6 @@ download-IOB-WIN-NEXT: - source: https://nexus.steamware.net/repository/utility/MAPO/IOB-WIN-NEXT/stable/IOB-WIN-NEXT.zip - source_hash: https://nexus.steamware.net/repository/utility/MAPO/IOB-WIN-NEXT/stable/IOB-WIN-NEXT.zip.md5 - -# Script inizio update (copia conf + kill) -WinUpdStart: - cmd.script: - - name: c:/Steamware/src/IobUpdStart.bat - - source: salt://IobUpdStart.bat - # Ora estraggo files in directory... extract-IOB-WIN-NEXT: archive.extracted: @@ -22,9 +21,9 @@ extract-IOB-WIN-NEXT: - enforce_toplevel: False - overwrite: True -# Script fine update (restore conf + lock remove) -WinUpdStop: - cmd.script: - - name: c:/Steamware/src/IobUpdStop.bat - - source: salt://IobUpdStop.bat +## Script fine update (restore conf + lock remove) +#WinUpdStop: +# cmd.script: +# - name: c:/Steamware/src/IobUpdStop.bat +# - source: salt://IobUpdStop.bat diff --git a/IobWinUpdateAll.sls b/IobWinUpdateAll.sls new file mode 100644 index 0000000..342865c --- /dev/null +++ b/IobWinUpdateAll.sls @@ -0,0 +1,6 @@ +include: + - IobUpdStart + - ConfManIob + - IobWinNext + - IobMan + - IobUpdStop diff --git a/iob-win-update.sls b/IobWinUpdateAll.sls.bak similarity index 53% rename from iob-win-update.sls rename to IobWinUpdateAll.sls.bak index 0466b77..6b34ceb 100644 --- a/iob-win-update.sls +++ b/IobWinUpdateAll.sls.bak @@ -1,10 +1,9 @@ -download-IOB-WIN: +download-IOB-WIN-NEXT: file.managed: - - name: c:/Steamware/src/MAPO-IOB-WIN.zip - - source: http://nexus.steamware.net/repository/utility/MAPO/IOB-WIN/stable/IOB-WIN-stable.zip + - name: c:/Steamware/src/MAPO-IOB-WIN-NEXT.zip + - source: http://nexus.steamware.net/repository/utility/MAPO/IOB-WIN-NEXT/stable/IOB-WIN-NEXT.zip - makedirs: True - - source_hash: http://nexus.steamware.net/repository/utility/MAPO/IOB-WIN/stable/IOB-WIN-stable.zip.md5 - + - source_hash: http://nexus.steamware.net/repository/utility/MAPO/IOB-WIN-NEXT/stable/IOB-WIN-NEXT.zip.md5 # Script inizio update (copia conf + kill) WinUpdStart: @@ -13,33 +12,47 @@ WinUpdStart: - source: salt://IobUpdStart.bat # Ora estraggo files in directory... -extract-IOB-WIN: +extract-IOB-WIN-NEXT: archive.extracted: - - name: c:\Steamware\IOB-WIN - - source: c:/Steamware/src/MAPO-IOB-WIN.zip - - source_hash: http://nexus.steamware.net/repository/utility/MAPO/IOB-WIN/stable/IOB-WIN-stable.zip.md5 + - name: c:\Steamware\IOB-WIN-NEXT + - source: c:/Steamware/src/MAPO-IOB-WIN-NEXT.zip + - source_hash: http://nexus.steamware.net/repository/utility/MAPO/IOB-WIN-NEXT/stable/IOB-WIN-NEXT.zip.md5 - skip_verify: False - enforce_toplevel: False - overwrite: True # download + unzip di IOB-MAN - download-IOB-MAN: file.managed: - name: c:/Steamware/src/IOB-MAN.zip - - source: http://nexus.steamware.net/repository/utility/MAPO/IOB-MAN/stable/IOB-MAN-stable.zip + - source: http://nexus.steamware.net/repository/utility/MAPO/IOB-MAN/stable/IOB-MAN.zip - makedirs: True - - source_hash: http://nexus.steamware.net/repository/utility/MAPO/IOB-MAN/stable/IOB-MAN-stable.zip.md5 + - source_hash: http://nexus.steamware.net/repository/utility/MAPO/IOB-MAN/stable/IOB-MAN.zip.md5 # Ora estraggo files in directory... extract-IOB-MAN: archive.extracted: - name: c:\Steamware\IOB-MAN\ - source: c:/Steamware/src/IOB-MAN.zip - - source_hash: http://nexus.steamware.net/repository/utility/MAPO/IOB-MAN/stable/IOB-MAN-stable.zip.md5 + - source_hash: http://nexus.steamware.net/repository/utility/MAPO/IOB-MAN/stable/IOB-MAN.zip.md5 - enforce_toplevel: False - overwrite: True +# download ConfigMan.IOB +download-ConfManIOB: + file.managed: + - name: c:/Steamware/ConfMan.IOB/ConfMan.IOB.CApp.exe + - source: https://nexus.steamware.net/repository/utility/ConfMan.IOB/ConfMan.IOB.CApp.exe + - makedirs: True + - source_hash: https://nexus.steamware.net/repository/utility/ConfMan.IOB/ConfMan.IOB.CApp.exe.md5 + +download-ConfManIOB-yaml: + file.managed: + - name: c:/Steamware/ConfMan.IOB/conf.yaml + - source: https://nexus.steamware.net/repository/utility/ConfMan.IOB/conf.yaml + - makedirs: True + - source_hash: https://nexus.steamware.net/repository/utility/ConfMan.IOB/conf.yaml.md5 + # Script fine update (restore conf + lock remove) ManUpdStop: cmd.script: diff --git a/RedisUP.sls b/RedisUP.sls index 87da2e6..71d3eb0 100644 --- a/RedisUP.sls +++ b/RedisUP.sls @@ -9,8 +9,28 @@ install-Redis: cmd.run: - name: "msiexec.exe /i c:\\Steamware\\src\\Redis-x64-5.0.14.msi /qn /norestart" +RDM: + file.managed: + - name: c:/Steamware/src/redis-desktop-manager.exe + - source: https://nexus.steamware.net/repository/utility/Redis/redis-desktop-manager-0.9.3.817.exe + - makedirs: True + - source_hash: https://nexus.steamware.net/repository/utility/Redis/redis-desktop-manager-0.9.3.817.exe.md5 -redis-desktop-man: - chocolatey: - - installed - - name: redis-desktop-manager +#install-RDM: +# cmd.run: +# - name: "c:/Steamware/src/redis-desktop-manager.exe /s /v /qn License=Yes" + +RedIns: + file.managed: + - name: c:/Steamware/src/RedisInsight-Installer.exe + - source: https://nexus.steamware.net/repository/utility/Redis/RedisInsight-v2-win-installer.exe + - makedirs: True + - source_hash: https://nexus.steamware.net/repository/utility/Redis/RedisInsight-v2-win-installer.exe.md5 + +#install-RedIns: +# cmd.run: +# - name: "c:/Steamware/src/RedisInsight-Installer.exe /s /v /qn License=Yes" + +# chocolatey: +# - installed +# - name: redis-desktop-manager diff --git a/developWin.sls b/developWin.sls index 7db7800..86135d1 100644 --- a/developWin.sls +++ b/developWin.sls @@ -13,16 +13,16 @@ tailblazer: - installed - name: tailblazer - source: https://nexus.steamware.net/repository/choco-proxy/ -snaketail: - chocolatey: - - installed - - name: snaketail - - source: https://nexus.steamware.net/repository/choco-proxy/ -redis-desk-man: - chocolatey: - - installed - - name: redis-desktop-manager - - source: https://nexus.steamware.net/repository/choco-proxy/ +#snaketail: +# chocolatey: +# - installed +# - name: snaketail +# - source: https://nexus.steamware.net/repository/choco-proxy/ +#redis-desk-man: +# chocolatey: +# - installed +# - name: redis-desktop-manager +# - source: https://nexus.steamware.net/repository/choco-proxy/ download-Redis: file.managed: - name: c:/Steamware/src/Redis-x64-5.0.14.msi diff --git a/iobWinStep01.sls b/iobWinStep01.sls index 2b0d121..e13639c 100644 --- a/iobWinStep01.sls +++ b/iobWinStep01.sls @@ -3,22 +3,15 @@ autologon: chocolatey: - installed - name: autologon -snaketail: +tailblazer: chocolatey: - installed - - name: snaketail + - name: tailblazer -#redis: +#snaketail: # chocolatey: # - installed -# - name: redis-64 - -#download-Redis: -# file.managed: -# - name: c:/Steamware/src/Redis-x64-3.2.100.msi -# - source: http://nexus.steamware.net/repository/utility/Redis/Redis-x64-3.2.100.msi -# - makedirs: True -# - source_hash: http://nexus.steamware.net/repository/utility/Redis/Redis-x64-3.2.100.msi.md5 +# - name: snaketail download-Redis: file.managed: @@ -31,11 +24,16 @@ install-Redis: cmd.run: - name: "msiexec.exe /i c:\\Steamware\\src\\Redis-x64-5.0.14.msi /qn /norestart" - -redis-desktop-man: +# aggiunta dotnetcore 6... +dotNetCore6: chocolatey: - installed - - name: redis-desktop-manager + - name: dotnet-6.0-runtime + +#redis-desktop-man: +# chocolatey: +# - installed +# - name: redis-desktop-manager # FOCAS diff --git a/users.sls b/users.sls index 03c8324..f3a9a74 100644 --- a/users.sls +++ b/users.sls @@ -1,4 +1,5 @@ #marco: +# user.absent # user.present: # - fullname: Marco Salvi # - shell: /bin/bash