From 06a5dac7a4d9e611c8d53702322114b449f2b954 Mon Sep 17 00:00:00 2001
From: Samuele-StackUser <ceo@steamware.net>
Date: Thu, 27 Apr 2023 16:38:33 +0200
Subject: [PATCH] Aggiunta conf x backup conf

---
 IW202212.sls                           |  3 +++
 IobBackup.sls                          |  5 +++++
 IobUpdStart.sls                        |  6 +++++-
 IobWinUpdateAll.sls                    |  1 -
 Netcore_sta_gwms.sls                   |  2 +-
 ZipAndClean.bat                        | 21 +++++++++++++++++++++
 ssh-keys/marco.id_rsa.pub              |  1 -
 ssh-keys/marcolocatelli.id_ed25519.pub |  2 ++
 users.sls                              | 26 +++++++++++++-------------
 utils.sls                              |  9 ---------
 10 files changed, 50 insertions(+), 26 deletions(-)
 create mode 100644 IW202212.sls
 create mode 100644 IobBackup.sls
 create mode 100644 ZipAndClean.bat
 delete mode 100644 ssh-keys/marco.id_rsa.pub
 create mode 100644 ssh-keys/marcolocatelli.id_ed25519.pub

diff --git a/IW202212.sls b/IW202212.sls
new file mode 100644
index 0000000..a2ad761
--- /dev/null
+++ b/IW202212.sls
@@ -0,0 +1,3 @@
+include:
+  - iobWinStep01
+  - ConfManIob
diff --git a/IobBackup.sls b/IobBackup.sls
new file mode 100644
index 0000000..ce8067a
--- /dev/null
+++ b/IobBackup.sls
@@ -0,0 +1,5 @@
+# Script inizio update (copia conf + kill)
+DoZipBackup:
+   cmd.script: 
+    - name: c:/Steamware/src/ZipAndClean.bat; exit 0
+    - source: salt://ZipAndClean.bat
diff --git a/IobUpdStart.sls b/IobUpdStart.sls
index 423000f..d21f6f4 100644
--- a/IobUpdStart.sls
+++ b/IobUpdStart.sls
@@ -1,5 +1,9 @@
 # Script inizio update (copia conf + kill)
-ManUpdStart:
+DoZipBackup:
+   cmd.script: 
+    - name: c:/Steamware/src/ZipAndClean.bat; exit 0
+    - source: salt://ZipAndClean.bat
+UpdStart:
    cmd.script: 
     - name: c:/Steamware/src/IobUpdStart.bat; exit 0
     - source: salt://IobUpdStart.bat
diff --git a/IobWinUpdateAll.sls b/IobWinUpdateAll.sls
index 342865c..d5f2b55 100644
--- a/IobWinUpdateAll.sls
+++ b/IobWinUpdateAll.sls
@@ -1,6 +1,5 @@
 include:
   - IobUpdStart
-  - ConfManIob
   - IobWinNext
   - IobMan
   - IobUpdStop
diff --git a/Netcore_sta_gwms.sls b/Netcore_sta_gwms.sls
index eeee6e7..603f30e 100644
--- a/Netcore_sta_gwms.sls
+++ b/Netcore_sta_gwms.sls
@@ -15,7 +15,7 @@ dir_www:
 'cd /var/www/ && rm -fr publish*':
    cmd.run
 
-'cd /home/netcore/ && wget --user=SWDownloader --password=viaD@nte16 "http://nexus.steamware.net/repository/SWS/GWMS/stable/LAST/GWMS.UI.zip"':
+'cd /home/netcore/ && wget --user=SWDownloader --password=viaD@nte16 "https://nexus.steamware.net/repository/SWS/GWMS/stable/LAST/GWMS.UI.zip"':
    cmd.run
 
 package_unzip:
diff --git a/ZipAndClean.bat b/ZipAndClean.bat
new file mode 100644
index 0000000..39dd451
--- /dev/null
+++ b/ZipAndClean.bat
@@ -0,0 +1,21 @@
+REM Backup script tramite 7Zip delle folder IOB-MAN ed IOB-WIN-NEXT + pulizia file log oltre i 10 gg
+
+SET baseDir=C:\Steamware
+SET input1=IOB-MAN
+SET input2=IOB-WIN-NEXT
+SET outDir=C:\Steamware\Backup\IOB
+
+REM calcolo stringa datetime ordinabile
+for /f "tokens=2 delims=.=" %%i in ('wmic os get localdatetime /format:list') do set result=%%i
+
+REM eseguo ZIP delle cartelle
+"C:\Program Files\7-Zip\7z.exe" a "%outDir%\%result%\%input1%.zip" "%baseDir%\%input1%"
+"C:\Program Files\7-Zip\7z.exe" a "%outDir%\%result%\%input2%.zip" "%baseDir%\%input2%"
+
+REM svuoto file log 7+gg...
+forfiles /D -10 /M *.* /P "%baseDir%\%input1%\logs" /S /C "cmd /c del /f /q @path"
+forfiles /D -10 /M *.* /P "%baseDir%\%input2%\logs" /S /C "cmd /c del /f /q @path"
+
+
+TIMEOUT 3
+EXIT
diff --git a/ssh-keys/marco.id_rsa.pub b/ssh-keys/marco.id_rsa.pub
deleted file mode 100644
index 69029c4..0000000
--- a/ssh-keys/marco.id_rsa.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAx0PTapGjt//8SoseKkzRxZeIGpSxxCemfxBIrV3WivC4PUie3Whm2OScSLfD1FHXu8wMw5ynHwXvNh3NaIgULEM+vpzqk+M1tSl7Teuu1vqisfcyxj65dHsgF6LU1+gilF0Y7SWTyynxBntmYRlI+DGsHQ9B2NbGBs+bOKJzYq0= marco@Freesky
diff --git a/ssh-keys/marcolocatelli.id_ed25519.pub b/ssh-keys/marcolocatelli.id_ed25519.pub
new file mode 100644
index 0000000..9b70357
--- /dev/null
+++ b/ssh-keys/marcolocatelli.id_ed25519.pub
@@ -0,0 +1,2 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK07vt1NZJKc48WsFOcZIYHCmTXmelMlHro0R0CKpMve marco.locatelli@egalware.com
+
diff --git a/users.sls b/users.sls
index f3a9a74..39b6675 100644
--- a/users.sls
+++ b/users.sls
@@ -1,16 +1,3 @@
-#marco:
-#  user.absent
-#  user.present:
-#    - fullname: Marco Salvi
-#    - shell: /bin/bash
-#    - home: /home/marco
-#    - password: '$1$kK4.Rz43$Xfb1BOv5gEy.rU9Q2ZCVm1'
-#    - groups:
-#      - sudo
-#  ssh_auth.present:
-#    - user: marco
-#    - source: salt://ssh-keys/marco.id_rsa.pub
-#    - config: '%h/.ssh/authorized_keys'
 samuele:
   user.present:
     - fullname: Samuele E. Locatelli
@@ -33,4 +20,17 @@ steamware:
     - groups:
       - sudo
 
+marcolocatelli:
+  user.present:
+    - fullname: Marco Locatelli
+    - shell: /bin/bash
+    - home: /home/marcolocatelli
+    - password: '$6$7Z/Dt6isFylkPigM$kwfReFut2XcFHaw4VH14IjFQDDZCYSQ15riqCRLvR1BVll1uTRHgx9cYepML9sPO88V54.71aqrWarfZ8Qlc//'
+    - groups:
+      - sudo
+  ssh_auth.present:
+    - user: marcolocatelli
+    - source: salt://ssh-keys/marcolocatelli.id_ed25519.pub
+    - config: '%h/.ssh/authorized_keys'
+
 
diff --git a/utils.sls b/utils.sls
index 2938a88..6390b0a 100644
--- a/utils.sls
+++ b/utils.sls
@@ -25,15 +25,6 @@ aria2:
 nnn:
   pkg:
     - installed
-
-ncdu:
-  pkg:
-    - installed
-
 dos2unix:
   pkg:
     - installed
-
-mc: 
-  pkg:
-    - installed