revamped vault variable names

6 files changed, 39 insertions, 42 deletions

diff --git a/dan/group_vars/ele-ap.yml b/dan/group_vars/ele-ap.yml
index 2bde3262..aebf2c5c 100644
--- a/dan/group_vars/ele-ap.yml
+++ b/dan/group_vars/ele-ap.yml
@@ -1,14 +1,13 @@
 $ANSIBLE_VAULT;1.2;AES256;dan
-63613339303132626331363232633064343932343665303131343835393064663630383330336430
-6561373832613461326162616637623965623334366232310a356561653562316131373162396438
-34663930366633656332626638306562333838653639383833353634366131396637323133303265
-6365356533393337650a623339303237373136613739343435633937353462306231613264613530
-30333035663466626432386461666465613133313530643734393331386463613237626362346135
-61393139663563366135343831323838633564306262306663393131333662323138663039653861
-39343665346566346132616565363539623439313634633539633931376136363832666532306335
-34643739373861353230333537656639383564343938336662393638616130626365636564623236
-37643734633666353731373733353230643736636330633439323331323437623663386365353936
-37353532353064656134316331353030633864393438326333306137363665656231323965613163
-36393665316339653832333739646533366131663964353739326263633865366233326331353131
-65623166653237373163333036396334643261313061363764663166623633643637366161666665
-6338
+32646532623962336365633534396432393563373333633534353364666163323033383665663031
+3937613133303538376234613435386231643265383232610a646232363232323835653562623539
+30373934366232326135613665653239376666633766333363353265393838393737373038313065
+3032656365313666330a303836366432623635376434323862393762303264353130323161616238
+63656230666134376636343239393165646465646366656231373836306461643562626331333365
+39316432653039343535636465373336303936393861323762646132356236396164363034313565
+62633966306366396237343965653335313839366466616462623533616364663731316466643533
+36623463393863316531326230663633303435373365303039653463643736653737363663313739
+35393736653737343164363530613531623162376338333636346630303030326463356433643234
+35343737393365663137303838313537633633356663623435343164636465313732646637613038
+62313136373334316233653035613064353532376133396363666565626362366164356331653335
+38316530363835313637
diff --git a/dan/host_vars/ele-media.yml b/dan/host_vars/ele-media.yml
index dbdafead..6f82dc76 100644
--- a/dan/host_vars/ele-media.yml
+++ b/dan/host_vars/ele-media.yml
@@ -1,14 +1,13 @@
 $ANSIBLE_VAULT;1.2;AES256;dan
-31316230393666623739333361346439316430613266613632363530646235363462363231303139
-3566383530636261663664623230313735366165636266610a383435386233396665346339373736
-66343431386433386565663939323739633437353538353362663062366434616237346366353833
-6462366637303038310a323236363064313765353835623730346632336461623432353639316332
-63613736646430313131393362643839663136333038323432656530326239393234326561396663
-30643538383933623464363733303566343637363566666331366132313861393439323164636436
-65316235613532373533633730643638396364306563353663306539626437373461663738656664
-36383734346461333130393165656130626631336134343837633036333533343266333564653134
-36356438333236396637326362663139656332376332636331303438633261643439316432303461
-63343965333664336264366363343065303865373431303862366234336631326463363165373134
-35643963663163646330623733633230653239383765306238393035636562386631623539336362
-34303532366264343866343835636430383334613035396464323130623161383833313562356230
-3535
+36336431633737313134623361343333336337383961656534373537616562326436313434643533
+6565363937373161306436623535653563353965343835360a626435623931326461366336366235
+65316666303333336437326461653734613331666334343465633238303130323937333466393165
+6339373030663538650a373064306562633437316237633235336562386665376430376162303339
+33616236333066316663653563663532326338376437363134306462323239316463653234353338
+34323737663263323239663536643935316138306335316233323832333362323536313265373034
+37643963333364366539623066643233333531353332363837343763333161656161356561313365
+64363331333965326434646264346462643865323237383131393963343831303939363331663137
+38366233343134343336316330633463626331643265643631306232393734653231383863663130
+65386532323963333562653939663635313030626238366535636363326239663132323538376131
+34373935626332373462353833366139393637366233343933353937373738633436653835643835
+34626264323162373132
diff --git a/inventory/group_vars/ele-ap/main.yml b/inventory/group_vars/ele-ap/main.yml
index e1dfc71c..cb271b64 100644
--- a/inventory/group_vars/ele-ap/main.yml
+++ b/inventory/group_vars/ele-ap/main.yml
@@ -21,15 +21,15 @@ accesspoint_zones:
   lan:
     ssid: "elevate Staff"
     encryption: "psk2"
-    key: "{{ vault_ele_ap.accesspoint_zones.lan.key }}"
+    key: "{{ vault_accesspoint_zones.lan.key }}"
   guest:
     ssid: "elevate Public"
     encryption: "psk2"
-    key: "{{ vault_ele_ap.accesspoint_zones.guest.key }}"
+    key: "{{ vault_accesspoint_zones.guest.key }}"
   infoscreens:
     ssid: "elevate Infoscreens"
     encryption: "psk2"
-    key: "{{ vault_ele_ap.accesspoint_zones.infoscreens.key }}"
+    key: "{{ vault_accesspoint_zones.infoscreens.key }}"
 
 
 accesspoint_network_zones: "{{ accesspoint_network_zones_yaml | from_yaml }}"
diff --git a/inventory/group_vars/spreadspace/main.yml b/inventory/group_vars/spreadspace/main.yml
index aaaffddf..1ca94b23 100644
--- a/inventory/group_vars/spreadspace/main.yml
+++ b/inventory/group_vars/spreadspace/main.yml
@@ -5,4 +5,4 @@ acmetool_account_email: equinox@spreadspace.org
 
 blackmagic_desktopvideo_apt:
   username: "streaming"
-  password: "{{ vault_spreadspace.blackmagic_desktopvideo_apt_password }}"
+  password: "{{ vault_blackmagic_desktopvideo_apt.password }}"
diff --git a/inventory/host_vars/ele-media.yml b/inventory/host_vars/ele-media.yml
index 1f6f58a0..927b2bef 100644
--- a/inventory/host_vars/ele-media.yml
+++ b/inventory/host_vars/ele-media.yml
@@ -25,7 +25,7 @@ admin_user_host:
 ssh_allowusers_host: "{{ admin_user_host | map(attribute='name') | list }}"
 
 
-mysql_root_password: "{{ vault_ele_media.mysql_root_password }}"
+mysql_root_password: "{{ vault_mysql_root_password }}"
 
 docker_lvm:
   vg: "{{ host_name }}"
@@ -41,11 +41,11 @@ nextcloud_hostnames:
 nextcloud_db:
   db: nextcloud
   user: nextcloud
-  password: "{{ vault_ele_media.nextcloud_db.password }}"
+  password: "{{ vault_nextcloud_db.password }}"
 
 nextcloud_admin:
   username: admin
-  password: "{{ vault_ele_media.nextcloud_admin.password }}"
+  password: "{{ vault_nextcloud_admin.password }}"
 
 nextcloud_lvm:
   system:
diff --git a/spreadspace/group_vars/spreadspace.yml b/spreadspace/group_vars/spreadspace.yml
index c34fdc8d..fa11f52c 100644
--- a/spreadspace/group_vars/spreadspace.yml
+++ b/spreadspace/group_vars/spreadspace.yml
@@ -1,10 +1,9 @@
 $ANSIBLE_VAULT;1.2;AES256;spreadspace
-31313137643137373839333838343730353634616138643463333262373737356639396539643233
-3839663334323736343239373961353164646565653562390a383831383638383434623863333337
-34366232356438386563643165303735663737373566363038653061323765303466376135303565
-6331623630653931660a626235376639376231633735656333333764643064393834363134663936
-63393563323334373231643237353362653839326235336538363730356364643566303566316665
-64396539333132353131326664323866313161386232393536643733386231643737363962666531
-65336366336435633933666436616261303265326232386639333562323032393832633037636266
-36356262346132663165653530363239316438653637326330636537356234646535376365396538
-6231
+39646562616638623361393438313739626363356133653362363234323864653666616336653034
+3435366130373535623030383135313135393062393765380a363663363538623365393866653931
+34633031333038626264326233366162356466353266363630623363373437656261616235646438
+6332326132646561610a323234346463343339306132396139386166613766376164363331336436
+31313761373139336161393063616638663035396239393639356564316565663634333736643561
+62666362396439333232646665306436366164633835396463313663633933323535623766633436
+32386666636535663438656238366536366134623134613566326261636433336636353936396332
+32353139623732353035