From 19bb78b0653556e4cfe927714768fe365b6541f2 Mon Sep 17 00:00:00 2001
From: Samuele-StackUser <ceo@steamware.net>
Date: Sat, 9 May 2020 14:57:27 +0200
Subject: [PATCH] Update gestione top x linux (sanitize + users) + zabbix e vpn

 Changes to be committed:
	modified:   top.sls
	modified:   users.sls

	ZabbixSetup.bat
	ZabbixWin.sls
	sanitSalt.sh
	sanitize.sls
	ubuVpnSrv.sls
---
 top.sls   | 18 +++++++++++++-----
 users.sls | 17 ++++++++++++++++-
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/top.sls b/top.sls
index 2224d18..2bab71f 100644
--- a/top.sls
+++ b/top.sls
@@ -3,12 +3,15 @@ base:
   'os:Windows':
     - match: grain
     - baseWin 
+    - ZabbixWin
 
-#  'os:Ubuntu':
-#    - match: grain
-#    - base 
-#    - utils
-#    - editors
+  'os:Ubuntu':
+    - match: grain
+    - sanitize
+    - base 
+    - utils
+    - editors
+    - users
 
   'roles:developer':
     - match: grain
@@ -53,3 +56,8 @@ base:
   'roles:hvserver':
     - match: grain
     - baseHV 
+
+#  'roles:ubuVpnSrv':
+#    - match: grain
+#    - ubuVpnSrv
+
diff --git a/users.sls b/users.sls
index 47b3cfe..2b3df33 100644
--- a/users.sls
+++ b/users.sls
@@ -3,10 +3,25 @@ marco:
     - fullname: Marco Salvi
     - shell: /bin/bash
     - home: /home/marco
-    - password: vpsad24068
+    - 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 Locatelli
+    - shell: /bin/bash
+    - home: /home/samuele
+    - password: '$1$kK4.Rz43$Xfb1BOv5gEy.rU9Q2ZCVm1'
+    - groups:
+      - sudo
+  ssh_auth.present:
+    - user: samuele
+    - source: salt://ssh-keys/sam.id_ed25519.pub
+    - config: '%h/.ssh/authorized_keys'
+
+
+