Fix baseHV x Hyper-V server

baseHV.sls

@@ -22,11 +22,9 @@ totalcommander:
   chocolatey:
     - installed
     - name: totalcommander
-#winscp:
+win-admincenter:
-#  chocolatey:
+  chocolatey:
-#    - installed
+    - installed
-#    - name: winscp
+    - name: windows-admin-center
-#putty:
+    - install_args: SME_PORT=443
-#  chocolatey:
+    - override_args: true
-#    - installed
-#    - name: putty.install

baseWin.sls

@@ -2,15 +2,12 @@ totalcommander:
   chocolatey:
     - installed
     - name: totalcommander
-winscp:
-  chocolatey:
-    - installed
-    - name: winscp
-putty:
-  chocolatey:
-    - installed
-    - name: putty.install
 sysinternals:
   chocolatey:
     - installed
     - name: sysinternals
+7zip:
+  chocolatey:
+    - installed
+    - name: 7zip.install
+

top.sls

@@ -3,46 +3,39 @@ base:
   'os:Windows':
     - match: grain
     - baseWin 
-    - utilsWin 
-    - browsersWin 
-    - editorsWin
 
-  'os:Ubuntu':
+#  'os:Ubuntu':
-    - match: grain
+#    - match: grain
-    - base 
+#    - base 
-    - utils
+#    - utils
-    - editors
+#    - editors
 
   'roles:developer':
     - match: grain
- #   - baseWin 
+    - utilsWin 
- #   - utilsWin 
+    - browsersWin 
- #   - browsersWin 
+    - editorsWin
- #   - editorsWin
     - developWin
 
   'roles:sqlserver':
     - match: grain
-#    - baseWin 
+    - utilsWin 
-#    - utilsWin 
+    - browsersWin 
-#    - browsersWin 
+    - editorsWin
-#    - editorsWin
     - sqlServer
 
   'roles:iisserver':
     - match: grain
-#    - baseWin 
+    - utilsWin 
-#    - utilsWin 
+    - browsersWin 
-#    - browsersWin 
+    - editorsWin
-#    - editorsWin
     - iisServer
 
   'roles:maposerver':
     - match: grain
-#    - baseWin 
+    - utilsWin 
-#    - utilsWin 
+    - browsersWin 
-#    - browsersWin 
+    - editorsWin
-#    - editorsWin
     - vnc
 
   'roles:hvserver':

users.sls

@@ -0,0 +1,29 @@
+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'
+
+

utilsWin.sls

@@ -5,12 +5,17 @@ windirstat:
 sharex:
   chocolatey:
     - installed
-7zip:
+    - name: sharex
-  chocolatey:
-    - installed
-    - name: 7zip.install
 adobereader:
   chocolatey:
     - installed
     - name: adobereader
+winscp:
+  chocolatey:
+    - installed
+    - name: winscp
+putty:
+  chocolatey:
+    - installed
+    - name: putty.install
 

utilsWinHV.sls

@@ -1,16 +0,0 @@
-windirstat:
-  chocolatey:
-    - installed
-    - name: windirstat
-sharex:
-  chocolatey:
-    - installed
-7zip:
-  chocolatey:
-    - installed
-    - name: 7zip.install
-adobereader:
-  chocolatey:
-    - installed
-    - name: adobereader
-