From 6b5df945de9a5c7b9535d09ee90f6fbbc7ce6675 Mon Sep 17 00:00:00 2001
From: Ethan Paul <e@enp.one>
Date: Sat, 23 Nov 2019 21:43:39 -0500
Subject: [PATCH] Update user targets, remove password hashes

Update secrets submodule
---
 vars/secrets   |  2 +-
 vars/users.yml | 90 ++++----------------------------------------------
 2 files changed, 8 insertions(+), 84 deletions(-)

diff --git a/vars/secrets b/vars/secrets
index 65233f0..13a84c3 160000
--- a/vars/secrets
+++ b/vars/secrets
@@ -1 +1 @@
-Subproject commit 65233f0dd5b21d75af196d8d4bceea73090ff6dc
+Subproject commit 13a84c38c2f5d2f918e89810ceae2641a952d9de
diff --git a/vars/users.yml b/vars/users.yml
index 7171201..6d640da 100644
--- a/vars/users.yml
+++ b/vars/users.yml
@@ -8,29 +8,14 @@ users:
   # svc: (optional) whether the account is a service account
 
   - name: root
-    password: "$6$pZo6qzx..u1IoLs6$s0U0u5hyDBC1QjAYfPwGDcvGY50E7fRL0zEbQeFzDnt13Hkhlsq9wOM2f2wdXqlBjz2YUMiIeOgfNGCe6aU.L1"
-    targets:
-      - servers
-      - vms
-      - workstations
+    targets: [core, network, datastore]
     admin: True
     sshkeys: []
 
 # Automation users
 
   - name: ansible
-    password: "$6$SbdfIFNKL3jkMOdu$IOctsiJUQbOkj9dtGWV4lUqwwAA5nA8dLKFTLUrm5Fzk1Efl7QAxS36Vs94ra2JlqlYg1XKR7SNQM2q.fUa7t/"
-    targets:
-      - servers
-      - vms
-      - workstations
-      - datastore
-      - gitea
-      - bitwarden
-      - plex
-      - admin
-      - vpn
-      - nextcloud
+    targets: [core, network, datastore, recovery]
     admin: True
     svc: True
     sshkeys:
@@ -38,51 +23,11 @@ users:
       - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDN/E/zjwCruZf+mboBeBAtNFBInWMvdm6TjwpIg6jVoGgRmYQxEfIcqDSfBTQQ0gbyE3udTdTUDRLRu7ADktzL9J0IepEaYARfz8SANS/Hx2MR0NNy8DArrSFJCOillDA7E7UmNPIPeQl0O76p2ZjEDy6qZnTiW8eOtD7LCzJp4eGJanUPFhag8f4aSNbmiHGR25Zuk82w2/+KrqiI3gO0+jNlnPBf+XHNnFbtUIroupRfxgLdk1OahmkWHTSHkDtXiYrWIISarrHCgVqHTHo1KIX5+MPOH4S5VLB1kaY/O7+g/XlFrAciw8m0zjyBq0ILb+YTSrL9PYnSBtnHAVGJv2bB+TgCfF/nhQGqoqBqqQHFnX0y3JygmDTJMO+aE5wlvI5Laki7EHYPU4fL+Ge76l/dG9j2anw4/iHklbfk1UOxnLvJl593GAlILg1Kd8xx9VfYzVZ7GZym2zq3NI4uQ77T1H4iGoE67zarkn3peKacjX/KARq4weVvs3irHIHibnIuh/TGcS4eiQoNdPxsSA2wRKB6jeuXiV65F1rUDNGs80wcJmsAbZN8/u9Tt0o/Xc+L/LVhV0yrSeBUxzXtlaS+RfcteBXByO3xfC112Cj5grKVki5xWN9AY42Y6JhT3OyiO33dKUMEF/KfiEWWAfvQr/t1CI/rdcEbv3pyUw== epaul@ansible-vigil-nox
       - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDIbXaUzVqDDKDSC1iO/nOmxIcJoOoMvXE+CJRobEdpkkYSBmlPfburJvGMDMQ3O/88OfgBrG5S7HKlbgVPGEII0Vpsk5iwzOk5Tmo03nLz02Ilx1xXYxTrjUSwnexzbHpluHmqunKEIUVTMHpDz2m4UPgZ4ECsGp9/6n6+n//uLeJ4fQUO9x4L+VMbpDrtfpKN7/P6U30XBIb9bZuKznVPtqTmCy/BFkxTkIn9QKqDh5d49FY/xkOjy1K9zTWb78DFzBRf4sGEykrp19N6inL0eRstGSZAKhqL+qdRXOy/7n6l0u+CdXWl9ZFVXRFhVdAhYOgkEvtuqoasK1Fk3OMqP6SflFanuDiFBostfgfrf8SUV+7CFvOuSpEWgTqx/jPFZV4Vr6wx5ZFVs02OzZ6TJFaEHaLvOE/R3iLOiuFcvqVNpvstLiyiigsj1+DwhDJcwOr3DaEsNdUbv0BTI2P03wtHJtBQw5CaVr5zCBDEeUsL0bBVQdq+6d0NT+CPJNxSZlTmmrBBbgkpupxdnmX6VVBYfXnylsE8UZxY1d7yxba3+Wzp2yvlr2MVocwQmMTPEqimIsW0hsQ8iXi1nrDXecSojlDAeu+LBFuaCxO8H59GrrVWVTI2dAPLEcP+stNGLHqKZuh62t5TnmxuMMi0SY6jH7KiKmusD4fYafzrlQ== enpaul@vigil-nox
 
-# Service accounts
-
-  - name: svc_gitea
-    password: "$6$ThlNrAQeWYqeqHdY$4eoVF0FvZdDND9jCG9WpSPtf7akeEg5NqpcPqDBjrikV6e3wwS77umXqbkx0hrN/2ByahiW5dx/laQZa6xZrR."
-    targets:
-      - datastore
-      - gitea
-    admin: False
-    svc: True
-    sshkeys: []
-
-  - name: svc_plex
-    password: "$6$dDEwXYf6DYbVZCw4$KZWDDZV1bO7KwGdWkbsck/A.fAqxOyExy4MI8QHtnOyjumgImidTck71V3cs8rZ6nASsspqmIqy4YlWH9o1la."
-    targets:
-      - datastore
-      - plex
-    admin: False
-    svc: True
-    sshkeys: []
-
-  - name: svc_bitwarden
-    password: "$6$oWPdq2hmQV03IBuF$SgpAzN1XVIefwYZtvA2gVaHD3DcclyGugEbZLXGn./1KZocew96KQC6PJZhVOKX9PYlzfWntmEy0Y/VCKHWBj1"
-    targets:
-      - datastore
-      - bitwarden
-    admin: False
-    svc: True
-    sshkeys: []
-
 # Actual user accounts
 
   - name: enpaul
     fullname: Ethan N. Paul
-    password: "$6$pozMhN7KPm5B2bi5$tqJkTnCKIpt7uu6UtUAxh8Uf/8Vlwn7r89odtdt7IRcRb0fTpMCwxEhUbWMUUtZ9tldcq7R39p4bw8fjdF0UU0"
-    targets:
-      - servers
-      - vms
-      - workstations
-      - datastore
-      - gitea
-      - bitwarden
-      - plex
-      - admin
-      - vpn
-      - nextcloud
+    targets: [core, desktop, network, datastore, recovery, vms, cfs, vcs, vpn]
     admin: True
     sshkeys:
       - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPPpDBJ9yNAtZVc+Eoqj+Xc6oqb+hJedIUj38icSkSPj enpaul@inerro
@@ -93,46 +38,25 @@ users:
 
   - name: kaisersjr
     fullname: Sultan Jilani
-    password: "$6$Xxer5gAKkiDdYuI.$Yep2hja0l7bZko8sVpk9AzxDJwAet.lEXzpy/W0ghyL42z7AandboL9/MPXeHan0oQzEOAebTKnAxdpprV8Pg0"
-    targets:
-      - datastore
-      - gitea
-      - bitwarden
-      - vpn
-      - nextcloud
+    targets: [cfs, vcs, vpn]
     admin: False
     sshkeys: []
 
   - name: notsoninja
     fullname: Johnathan W. Adams
-    password: "$6$PNQCj9oRGTmPsV8B$wWIC10U7fAbaZKOxeYjaK9jhTeXG2LS94JFiOCJlGtcgzl8I4kI5212oBn8RJ2P9.fIm.7Zo/Ih6BrUGGZLyh/"
-    targets:
-      - datastore
-      - gitea
-      - vpn
-      - nextcloud
+    targets: [cfs, vcs, vpn]
     admin: False
     sshkeys: []
 
   - name: avalonburned
     fullname: Christine K. Deidrich
-    password: "$6$r4J9NQAJmwJnjKux$S6YQ2kV0y8O3Uxtei1Tpwm8qvQMMQQtOaV3LwZc19lkSS18k8ac2jqeB9o1eAfWZ.ZeD3DBrC8JMUcfGmbLaG/"
-    targets:
-      - datastore
-      - gitea
-      - vpn
-      - nextcloud
+    targets: [cfs, vcs, vpn]
     admin: False
     sshkeys:
       - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDtvvqlyhXTYl97dg8DyI53B3hVLoRhg8VF25P7cXrySiPadRZ6bocZG3iiAhQZtz7R/LieXSHma5D0vgF04fU83BDQYNtuQ36XStji+IbaM+rPTE/EavtQM0A2mxNZ1SOsoV+ueZAYD8rtKJ6Sqk/P7ARD1718Ep+vMFt5QMTkuu7I9Xg6/cFONknhlVlqRP2tpKekULg6fuqY6n/fpgm7IWEQyIB4budI6/hPImdrBBGKrSTNmOiZQOc5qOeMLxtT5bwS3ohbRxlnu2r9s6/S0xYyOG4Kkryif8KHbzjCL9e7tOvCxanIswq8DpLagP/hp6gad059ZHY0glX4VeSh+6JIGrOr6mGBxEEDAr2xuQ9FmIORe6E/C9F6i3r2q7tO9OMw4mnwVPO3+DIucGpYqVUYhXbPjrfPjWCiLrDby9hl5SQXNe7WV6/r5e/SJIOpt6aFDCEmn09ejeHilVG6+/j2smhsra6DKs7NxYPnJ2qJANKCYqMV2gdnZUMe4Nc= ckdeidrich@troublemaker
 
   - name: sglagovitch
     fullname: Sophia Glagovitch
-    password: "$6$JC4neE6pXlGAbwSA$13t55k38QHhAHYrt0Ybg51ADknX0lyRpyQOHwREUBeZ8kfxaVcOISt3EcwwSxxWWzwzW5hfRgbC82n3O.zcHr1"
-    targets:
-      - datastore
-      - gitea
-      - vpn
-      - nextcloud
+    targets: [cfs, vpn]
     admin: False
     sshkeys: []