diff --git a/IobMan.sls b/IobMan.sls index 67cd479..9f723ab 100644 --- a/IobMan.sls +++ b/IobMan.sls @@ -3,31 +3,22 @@ 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 # Script inizio update (copia conf + kill) ManUpdStart: cmd.script: - - name: c:/Steamware/src/IobUpdStart.bat + - name: c:/Steamware/src/IobUpdStart.bat; exit 0 - source: salt://IobUpdStart.bat -## faccio pulizia da dll e altro nella folder... -#clean-IOB-MAN-dll: -# cmd.run: -# - name: "del /f c:\\Steamware\\IOB-MAN\\*.dll" - -#clean-IOB-MAN-xml: -# cmd.run: -# - name: "del /f c:\\Steamware\\IOB-MAN\\*.xml" - # 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 diff --git a/IobUpdStart.bat b/IobUpdStart.bat index 9a24558..a47580a 100644 --- a/IobUpdStart.bat +++ b/IobUpdStart.bat @@ -1,11 +1,70 @@ -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... -copy /Y c:\Steamware\IOB-MAN\CONF\process.json c:\Steamware\src\process.json -robocopy c:\Steamware\IOB-WIN\DATA\CONF c:\Steamware\src\IOB-WIN\CONF_%mydate% /MIR -robocopy c:\Steamware\IOB-WIN\DATA\CONF c:\Steamware\src\IOB-WIN\CONF /MIR -REM chiudo i task in esecuzione -taskkill /IM "IOB-MAN.exe" /F -taskkill /IM "IOB-WIN.exe" /F +@REM Copia i file di configurazione in c:\Steamware\src per poi ripristinarli e chiudo le app prima del unzip + +@REM Se ci sono problemi di copia delle configurazioni crea il file update.err in modo che lo script di Stop successivo +@REM non ripristina i file (l'unzip non dovrebbe cmq sovrascrivere), inoltre fa copia ulteriore nella cartella +@REM c:\Steamware\src\Salt_Err\ + +@REM Indico update in esecuzione da file... +@ECHO > c:\Steamware\IOB-MAN\update.run + +@SET ERR=0 + +@REM "Verifico se esiste file di errore copia configurazione precedente e lo cancello..." +@if not exist c:\Steamware\IOB-MAN\update.err GOTO:COPIA + @echo "Trovato File di errore copia configurazione precedente... lo cancello..." + DEL /f c:\Steamware\IOB-MAN\update.err + +:COPIA +@ECHO . +@ECHO ">>> Salvo Configurazione, per sicurezza faccio anche copia del file di config 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 IOB-WIN-NEXT ..." + +:NEXT1 +copy /Y c:\Steamware\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 IOB-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 + + +@ECHO "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 vado a blocco ERR altrimenti esco ... +@IF %ERR% GTR 0 GOTO:ERR + +TIMEOUT 3 +EXIT + +:ERR +@ECHO Creo file semaforo ERRORE copia configurazione per script successivo di stop... +@ECHO > c:\Steamware\IOB-MAN\update.err + +@REM Recupero dataora +@SET mydate=19000101_0101 +@FOR /F %%T IN ('POWERSHELL get-date -format yyyyMMdd_HHmmss') DO CALL SET mydate=%%T + +@ECHO "faccio copia di sicurezza con data se possibile in c:\Steamware\src\Salt_Err\%mydate%" +XCOPY c:\Steamware\IOB-WIN-NEXT\DATA\CONF\*.* c:\Steamware\src\Salt_Err\%mydate%\ +XCOPY c:\Steamware\IOB-MAN\CONF\process.json c:\Steamware\src\Salt_Err\%mydate%\ + +TIMEOUT 3 diff --git a/IobUpdStop.bat b/IobUpdStop.bat index 4a00b9d..49588da 100644 --- a/IobUpdStop.bat +++ b/IobUpdStop.bat @@ -1,4 +1,32 @@ -REM Riporto indietro file conf -copy /Y c:\Steamware\src\process.json c:\Steamware\IOB-MAN\CONF\process.json -REM cancello file blocco rilancio +@REM "Se File di errore copia configurazione Precedente Salto Ripristino..." +@if exist c:\Steamware\IOB-MAN\update.err GOTO:ERRPREC + +@ECHO "Riporto indietro files di conf (anche IOB vecchio se presente...) +Copy /Y c:\Steamware\src\process.json c:\Steamware\IOB-MAN\CONF\process.json && GOTO:NEXT1 || GOTO:MSGERR1 + +:MSGERR1 +@SET ERR=1 +@ECHO "." +@ECHO "<<<< ATTENZIONE! >>>>> ERRORE RESTORE FILE DI CONFIGURAZIONE WIN-MAN..." + +:NEXT1 +robocopy c:\Steamware\src\IOB-WIN-NEXT\CONF c:\Steamware\IOB-WIN-NEXT\DATA\CONF && GOTO:NEXT2 || GOTO:MSGERR2 + +:MSGERR2 +@SET ERR=2 +@ECHO "." +@ECHO "<<<< ATTENZIONE! >>>>> ERRORE RESTORE FILE DI CONFIGURAZIONE WIN-NEXT ..." + +:NEXT2 +robocopy c:\Steamware\src\IOB-WIN\CONF c:\Steamware\IOB-WIN\DATA\CONF /MIR && GOTO:END || GOTO:END + +:ERRPREC +@ECHO . +@ECHO "<<<< ATTENZIONE! >>>>> Errore nella copia configurazione PRECEDENTE quindi Salto Ripristino..." +@ECHO . +@ECHO "Verificare procedura e copie files in C:\Steamware\src\Salt_Err\" +@ECHO . + +:END +@ECHO "Cancello sempre file blocco avvio programma update.run per update..." del /f c:\Steamware\IOB-MAN\update.run diff --git a/IobWin.sls b/IobWin.sls index 9a968ea..f459458 100644 --- a/IobWin.sls +++ b/IobWin.sls @@ -1,9 +1,9 @@ download-IOB-WIN: 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 + - source: https://nexus.steamware.net/repository/utility/MAPO/IOB-WIN/stable/IOB-WIN.zip - makedirs: True - - source_hash: http://nexus.steamware.net/repository/utility/MAPO/IOB-WIN/stable/IOB-WIN-stable.zip.md5 + - source_hash: https://nexus.steamware.net/repository/utility/MAPO/IOB-WIN/stable/IOB-WIN.zip.md5 # Script inizio update (copia conf + kill) @@ -12,42 +12,16 @@ WinUpdStart: - name: c:/Steamware/src/IobUpdStart.bat - source: salt://IobUpdStart.bat -# per sicurezza faccio copio del file di config... -#config-backup: -# cmd.run: -# - name: "robocopy c:\\Steamware\\IOB-WIN\\DATA\\CONF c:\\Steamware\\src\\IOB-WIN\\CONF /MIR" - -# indico update in esecuzione da file... -#set-update-run: -# cmd.run: -# - name: "echo > c:\\Steamware\\IOB-MAN\\update.run" - -# chiudo il task in esecuzione -#close-IOB-MAN: -# cmd.run: -# - name: "taskkill /IM \"IOB-MAN.exe\" /F" - -#close-IOB-WIN: -# cmd.run: -# - name: "taskkill /IM \"IOB-WIN.exe\" /F" - - # Ora estraggo files in directory... extract-IOB-WIN: 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 + - source_hash: https://nexus.steamware.net/repository/utility/MAPO/IOB-WIN/stable/IOB-WIN.zip.md5 - skip_verify: False - enforce_toplevel: False - overwrite: True -# indico update completato... -#set-update-done: -# cmd.run: -# - name: "del /f c:\\Steamware\\IOB-MAN\\update.run" - - # Script fine update (restore conf + lock remove) WinUpdStop: cmd.script: diff --git a/IobWin.sls.old b/IobWin.sls.old deleted file mode 100644 index 3666887..0000000 --- a/IobWin.sls.old +++ /dev/null @@ -1,16 +0,0 @@ -download-IOB-WIN: - file.managed: - - name: c:/Steamware/src/MAPO-IOB-WIN.zip - - source: http://nexus.steamware.net/repository/utility/MAPO/IOB-WIN/MAPO-IOB-WIN.zip - - makedirs: True - - source_hash: http://nexus.steamware.net/repository/utility/MAPO/IOB-WIN/MAPO-IOB-WIN.md5 - -# Ora estraggo files in directory... -extract-IOB-WIN: - 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/MAPO-IOB-WIN.md5 - - skip_verify: False - - enforce_toplevel: False - diff --git a/MAPO.sls b/MAPO.sls index 880d351..ba40b3a 100644 --- a/MAPO.sls +++ b/MAPO.sls @@ -12,10 +12,26 @@ base: - base - editors + 'roles:builder': + - match: grain + - buildWin + + 'roles:develop': + - match: grain + - developWin + 'roles:developer': - match: grain - developWin + 'roles:developDb': + - match: grain + - developDb + + 'roles:developVS': + - match: grain + - developVS + 'roles:sqlserver': - match: grain - sqlServer diff --git a/baseWin.sls b/baseWin.sls index a3990d6..ee34e8d 100644 --- a/baseWin.sls +++ b/baseWin.sls @@ -6,6 +6,17 @@ sysinternals: chocolatey: - installed - name: sysinternals + +tabby: + chocolatey: + - installed + - name: tabby + +#windowTerm: +# chocolatey: +# - installed +# - name: microsoft-windows-terminal + 7zip: chocolatey: - installed diff --git a/developWin.sls b/developWin.sls index 73e52c0..7db7800 100644 --- a/developWin.sls +++ b/developWin.sls @@ -1,29 +1,35 @@ -vscode: - chocolatey: - - installed - - name: vscode -snaketail: - chocolatey: - - installed - - name: snaketail git: chocolatey: - installed - name: git.install + - source: https://nexus.steamware.net/repository/choco-proxy/ +vscode: + chocolatey: + - installed + - name: vscode + - source: https://nexus.steamware.net/repository/choco-proxy/ +tailblazer: + chocolatey: + - 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 -vs2019-comm: - chocolatey: - - installed - - name: visualstudio2019community -SSMS: - chocolatey: - - installed - - name: sql-server-management-studio + - source: https://nexus.steamware.net/repository/choco-proxy/ +download-Redis: + file.managed: + - name: c:/Steamware/src/Redis-x64-5.0.14.msi + - source: http://nexus.steamware.net/repository/utility/Redis/Redis-x64-5.0.14.msi + - makedirs: True + - source_hash: http://nexus.steamware.net/repository/utility/Redis/Redis-x64-5.0.14.msi.md5 -#paintDotNet: -# chocolatey: -# - installed -# - name: paint.net +install-Redis-dev: + cmd.run: + - name: "msiexec.exe /i c:\\Steamware\\src\\Redis-x64-5.0.14.msi /qn /norestart" diff --git a/iisServer.sls b/iisServer.sls index 6271195..3248b38 100644 --- a/iisServer.sls +++ b/iisServer.sls @@ -23,16 +23,23 @@ webdeploy: - installed - name: webdeploy -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 +#download-Redisi-iis: +# 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 -install-Redis: +download-RedisUp: + file.managed: + - name: c:/Steamware/src/Redis-x64-5.0.14.msi + - source: http://nexus.steamware.net/repository/utility/Redis/Redis-x64-5.0.14.msi + - makedirs: True + - source_hash: http://nexus.steamware.net/repository/utility/Redis/Redis-x64-5.0.14.msi.md5 + +install-Redis-iis: cmd.run: - - name: "msiexec.exe /i c:\\Steamware\\src\\Redis-x64-3.2.100.msi /qn /norestart" + - name: "msiexec.exe /i c:\\Steamware\\src\\Redis-x64-5.0.14.msi /qn /norestart" #redis: # chocolatey: diff --git a/iobWinStep01.sls b/iobWinStep01.sls index 3421034..2b0d121 100644 --- a/iobWinStep01.sls +++ b/iobWinStep01.sls @@ -13,16 +13,23 @@ snaketail: # - 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 + 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 + - name: c:/Steamware/src/Redis-x64-5.0.14.msi + - source: http://nexus.steamware.net/repository/utility/Redis/Redis-x64-5.0.14.msi - makedirs: True - - source_hash: http://nexus.steamware.net/repository/utility/Redis/Redis-x64-3.2.100.msi.md5 + - source_hash: http://nexus.steamware.net/repository/utility/Redis/Redis-x64-5.0.14.msi.md5 install-Redis: cmd.run: - - name: "msiexec.exe /i c:\\Steamware\\src\\Redis-x64-3.2.100.msi /qn /norestart" + - name: "msiexec.exe /i c:\\Steamware\\src\\Redis-x64-5.0.14.msi /qn /norestart" redis-desktop-man: diff --git a/sqlServer.sls b/sqlServer.sls index e449fc8..8319c4c 100644 --- a/sqlServer.sls +++ b/sqlServer.sls @@ -1,10 +1,10 @@ -sql2016: - chocolatey: - - installed - - name: mssqlserver2016expressadv - - install_args: SECURITYMODE=SQL - - install_args: SAPWD=viadante16 - - override_args: true +#sql2016: +# chocolatey: +# - installed +# - name: mssqlserver2016expressadv +# - install_args: SECURITYMODE=SQL +# - install_args: SAPWD=viadante16 +# - override_args: true #SSMS: # chocolatey: # - installed diff --git a/top.sls b/top.sls index 2458e94..191e2c4 100644 --- a/top.sls +++ b/top.sls @@ -22,6 +22,20 @@ base: - editors - users + 'roles:builder': + - match: grain + - utilsWin + - browsersWin + - editorsWin + - buildWin + + 'roles:develop': + - match: grain + - utilsWin + - browsersWin + - editorsWin + - developWin + 'roles:developer': - match: grain - utilsWin @@ -29,6 +43,14 @@ base: - editorsWin - developWin + 'roles:developDb': + - match: grain + - developDb + + 'roles:developVS': + - match: grain + - developVS + 'roles:sqlserver': - match: grain - utilsWin @@ -57,10 +79,10 @@ base: - editorsWin - vnc - iobWinStep01 - - IobMan - - IobWin - - IobWinData - - iobWinStep04 +# - IobMan +# - IobWin +# - IobWinData +# - iobWinStep04 'roles:hvserver': - match: grain diff --git a/users.sls_bck b/users.sls_bck deleted file mode 100644 index 03d0b9e..0000000 --- a/users.sls_bck +++ /dev/null @@ -1,29 +0,0 @@ -marco: - user.present: - - fullname: Marco Salvi - - shell: /bin/bash - - home: /home/marco - - groups: - - wheel - - storage - - sudo - ssh_auth.present: - - user: marco - - source: salt://ssh-keys/marco.id_rsa.pub - - config: '%h/.ssh/authorized_keys' - -samuele: - user.present - - fullname: Samuele Locatelli - - shell: /bin/bash - - home: /home/samuele - - groups: - - wheel - - storage - - sudo - ssh_auth.present: - - user: samuele - - source: salt://ssh-keys/samuele.id_ed25519.pub - - config: '%h/.ssh/authorized_keys' - - diff --git a/wrkWin.sls b/wrkWin.sls index 880d351..ba40b3a 100644 --- a/wrkWin.sls +++ b/wrkWin.sls @@ -12,10 +12,26 @@ base: - base - editors + 'roles:builder': + - match: grain + - buildWin + + 'roles:develop': + - match: grain + - developWin + 'roles:developer': - match: grain - developWin + 'roles:developDb': + - match: grain + - developDb + + 'roles:developVS': + - match: grain + - developVS + 'roles:sqlserver': - match: grain - sqlServer