Egalware/SaltStates
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix status UpgradeAll come somma di vari step, separando le varie parti

Browse Source
This commit is contained in:
Samuele-StackUser
2022-12-30 12:02:05 +01:00
parent f6eb35298a
commit 93a51cfd3a
17 changed files with 145 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.Netcore_datacube.sls.swp
BIN
View File
Binary file not shown.
ConfManIob.sls
+26
View File
@@ -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
IobMan.sls
+14 -15
View File
@@ -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
IobUpdStart.bat
+2
View File
@@ -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
IobUpdStart.bat_0422
-25
View File
@@ -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
IobUpdStart.bat_150422
-57
View File
@@ -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\
IobUpdStart.sls
+5
View File
@@ -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
IobUpdStop.sls
+5
View File
@@ -0,0 +1,5 @@
# Script fine update (restore conf + lock remove)
ManUpdStop:
cmd.script:
- name: c:/Steamware/src/IobUpdStop.bat
- source: salt://IobUpdStop.bat
IobWinData.sls
+3 -3
View File
@@ -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
IobWin.sls → IobWinLegacy.sls
View File
IobWinNext.sls
+11 -12
View File
@@ -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
IobWinUpdateAll.sls
+6
View File
@@ -0,0 +1,6 @@
include:
- IobUpdStart
- ConfManIob
- IobWinNext
- IobMan
- IobUpdStop
iob-win-update.sls → IobWinUpdateAll.sls.bak
+26 -13
View File
@@ -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:
RedisUP.sls
+24 -4
View File
@@ -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
developWin.sls
+10 -10
View File
@@ -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
iobWinStep01.sls
+12 -14
View File
@@ -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
users.sls
+1
View File
@@ -1,4 +1,5 @@
#marco:
# user.absent
# user.present:
# - fullname: Marco Salvi
# - shell: /bin/bash