summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2024-08-24 19:25:40 +0200
committerChristian Pointner <equinox@spreadspace.org>2024-08-24 19:25:40 +0200
commitb17c559251dfd157fe2cf220044887f08208bb3c (patch)
treef395cb16d81a65955f9a12a88c9eab862848d976
parentallow ssh jump users to also do reverse forwards (diff)
split environment group dan to skillz and elevate
-rw-r--r--elevate/cloud-install.yml (renamed from dan/cloud-install.yml)0
-rw-r--r--elevate/common.yml (renamed from dan/common.yml)0
-rw-r--r--elevate/ele-calypso.yml (renamed from dan/ele-calypso.yml)0
-rw-r--r--elevate/ele-chromebook.yml (renamed from dan/ele-chromebook.yml)0
-rw-r--r--elevate/ele-companion-raspi.yml (renamed from dan/ele-companion-raspi.yml)0
-rw-r--r--elevate/ele-coturn.yml (renamed from dan/ele-coturn.yml)0
-rw-r--r--elevate/ele-dione.yml (renamed from dan/ele-dione.yml)0
-rw-r--r--elevate/ele-dolmetsch-raspi.yml (renamed from dan/ele-dolmetsch-raspi.yml)0
-rw-r--r--elevate/ele-emc-ctrl.yml (renamed from dan/ele-emc-ctrl.yml)0
-rw-r--r--elevate/ele-emcplayer.yml (renamed from dan/ele-emcplayer.yml)0
-rw-r--r--elevate/ele-gwhetzner.yml (renamed from dan/ele-gwhetzner.yml)0
-rw-r--r--elevate/ele-helene.yml (renamed from dan/ele-helene.yml)0
-rw-r--r--elevate/ele-hpws-maxi.yml (renamed from dan/ele-hpws-maxi.yml)0
-rw-r--r--elevate/ele-hpws-mini1.yml (renamed from dan/ele-hpws-mini1.yml)0
-rw-r--r--elevate/ele-hpws-mini2.yml (renamed from dan/ele-hpws-mini2.yml)0
-rw-r--r--elevate/ele-hyperion.yml (renamed from dan/ele-hyperion.yml)0
-rw-r--r--elevate/ele-jitsi.yml (renamed from dan/ele-jitsi.yml)0
-rw-r--r--elevate/ele-lt.yml (renamed from dan/ele-lt.yml)0
-rw-r--r--elevate/ele-media.yml (renamed from dan/ele-media.yml)0
-rw-r--r--elevate/ele-router.yml (renamed from dan/ele-router.yml)0
-rw-r--r--elevate/ele-stage-raspi.yml (renamed from dan/ele-stage-raspi.yml)0
-rw-r--r--elevate/ele-tarvos.yml (renamed from dan/ele-tarvos.yml)0
-rw-r--r--elevate/ele-telesto.yml (renamed from dan/ele-telesto.yml)0
-rw-r--r--elevate/ele-thetys.yml (renamed from dan/ele-thetys.yml)0
-rw-r--r--elevate/ele-tsdatacop.yml (renamed from dan/ele-tsdatacop.yml)0
-rw-r--r--elevate/ele-uhrturm.yml (renamed from dan/ele-uhrturm.yml)0
-rw-r--r--elevate/ele-winvm.yml (renamed from dan/ele-winvm.yml)0
-rw-r--r--elevate/ele-ymir.yml (renamed from dan/ele-ymir.yml)0
-rw-r--r--elevate/emc-cdn.yml (renamed from dan/emc-cdn.yml)0
-rw-r--r--elevate/generic.yml (renamed from dan/generic.yml)0
-rw-r--r--elevate/group_vars/all.yml12
-rw-r--r--elevate/group_vars/ele-router.yml (renamed from dan/group_vars/ele-router.yml)2
-rw-r--r--elevate/group_vars/elevate-festival.yml (renamed from dan/group_vars/elevate-festival.yml)2
-rw-r--r--elevate/group_vars/elevate-mediachannel.yml (renamed from dan/group_vars/elevate-mediachannel.yml)2
-rw-r--r--elevate/group_vars/elevate.yml (renamed from dan/group_vars/elevate.yml)2
-rw-r--r--elevate/group_vars/k8s-emc.yml (renamed from dan/group_vars/k8s-emc.yml)2
-rw-r--r--elevate/host_vars/ele-calypso.yml (renamed from dan/host_vars/ele-calypso.yml)2
-rw-r--r--elevate/host_vars/ele-coturn.yml (renamed from dan/host_vars/ele-coturn.yml)2
-rw-r--r--elevate/host_vars/ele-gwhetzner.yml (renamed from dan/host_vars/ele-gwhetzner.yml)2
-rw-r--r--elevate/host_vars/ele-jitsi.yml (renamed from dan/host_vars/ele-jitsi.yml)2
-rw-r--r--elevate/host_vars/ele-lt.yml (renamed from dan/host_vars/ele-lt.yml)2
-rw-r--r--elevate/host_vars/ele-media.yml (renamed from dan/host_vars/ele-media.yml)2
-rw-r--r--elevate/image-generate.yml (renamed from dan/image-generate.yml)0
-rw-r--r--elevate/info-beamer.yml (renamed from dan/info-beamer.yml)0
-rw-r--r--elevate/iso-generate.yml (renamed from dan/iso-generate.yml)0
-rw-r--r--elevate/iso-install.yml (renamed from dan/iso-install.yml)0
-rw-r--r--elevate/k8s-emc.yml (renamed from dan/k8s-emc.yml)0
-rw-r--r--elevate/openwrt-deploy.yml (renamed from dan/openwrt-deploy.yml)0
-rw-r--r--elevate/usb-generate.yml (renamed from dan/usb-generate.yml)0
-rw-r--r--elevate/usb-install.yml (renamed from dan/usb-install.yml)0
-rw-r--r--elevate/vm-deploy.yml (renamed from dan/vm-deploy.yml)0
-rw-r--r--elevate/vm-install.yml (renamed from dan/vm-install.yml)0
-rw-r--r--files/elevate/elevatge_logo_white_sm.png (renamed from files/dan/elevate/elevatge_logo_white_sm.png)bin2801 -> 2801 bytes
-rw-r--r--files/elevate/elevatge_turm_white_sm.png (renamed from files/dan/elevate/elevatge_turm_white_sm.png)bin9466 -> 9466 bytes
-rw-r--r--files/elevate/info-beamer/branding.ppm (renamed from files/dan/elevate/info-beamer/branding.ppm)bin24352 -> 24352 bytes
-rw-r--r--files/elevate/info-beamer/e19-branding.jpg (renamed from files/dan/elevate/info-beamer/e19-branding.jpg)bin679499 -> 679499 bytes
-rw-r--r--files/elevate/info-beamer/e20-branding.jpg (renamed from files/dan/elevate/info-beamer/e20-branding.jpg)bin400517 -> 400517 bytes
-rw-r--r--files/elevate/info-beamer/e21-branding.jpg (renamed from files/dan/elevate/info-beamer/e21-branding.jpg)bin724935 -> 724935 bytes
-rw-r--r--files/elevate/info-beamer/e22-branding.jpg (renamed from files/dan/elevate/info-beamer/e22-branding.jpg)bin467217 -> 467217 bytes
-rw-r--r--files/elevate/info-beamer/e23-branding.jpg (renamed from files/dan/elevate/info-beamer/e23-branding.jpg)bin636970 -> 636970 bytes
-rw-r--r--files/elevate/info-beamer/e24-branding.jpg (renamed from files/dan/elevate/info-beamer/e24-branding.jpg)bin177367 -> 177367 bytes
-rwxr-xr-xgpg/get-vault-pass-elevate (renamed from gpg/get-vault-pass-dan)0
-rwxr-xr-xgpg/get-vault-pass-skillz2
-rw-r--r--gpg/vault-keyring-elevate.gpg (renamed from gpg/vault-keyring-dan.gpg)bin63063 -> 63063 bytes
-rw-r--r--gpg/vault-keyring-skillz.gpgbin0 -> 63063 bytes
-rw-r--r--gpg/vault-pass-elevate.gpg (renamed from gpg/vault-pass-dan.gpg)0
-rw-r--r--gpg/vault-pass-skillz.gpg30
-rw-r--r--inventory/group_vars/all/users.yml8
-rw-r--r--inventory/group_vars/ele-infobeamer/vars.yml4
-rw-r--r--inventory/hosts.ini12
-rw-r--r--skillz/cloud-install.yml10
-rw-r--r--skillz/common.yml10
-rw-r--r--skillz/generic.yml5
-rw-r--r--skillz/group_vars/all.yml (renamed from dan/group_vars/all.yml)2
-rw-r--r--skillz/host_vars/sk-2019.yml (renamed from dan/host_vars/sk-2019.yml)2
-rw-r--r--skillz/host_vars/sk-2019vm.yml (renamed from dan/host_vars/sk-2019vm.yml)2
-rw-r--r--skillz/host_vars/sk-cloudio.yml (renamed from dan/host_vars/sk-cloudio.yml)2
-rw-r--r--skillz/host_vars/sk-testvm.yml (renamed from dan/host_vars/sk-testvm.yml)2
-rw-r--r--skillz/host_vars/sk-tomnext-nc.yml (renamed from dan/host_vars/sk-tomnext-nc.yml)2
-rw-r--r--skillz/host_vars/sk-tomnext.yml (renamed from dan/host_vars/sk-tomnext.yml)2
-rw-r--r--skillz/host_vars/sk-torrent.yml (renamed from dan/host_vars/sk-torrent.yml)2
-rw-r--r--skillz/image-generate.yml20
-rw-r--r--skillz/iso-generate.yml10
-rw-r--r--skillz/iso-install.yml10
-rw-r--r--skillz/openwrt-deploy.yml9
-rw-r--r--skillz/sk-2019.yml (renamed from dan/sk-2019.yml)0
-rw-r--r--skillz/sk-2019vm.yml (renamed from dan/sk-2019vm.yml)0
-rw-r--r--skillz/sk-cloudio.yml (renamed from dan/sk-cloudio.yml)0
-rw-r--r--skillz/sk-testvm.yml (renamed from dan/sk-testvm.yml)0
-rw-r--r--skillz/sk-tomnext-hp.yml (renamed from dan/sk-tomnext-hp.yml)0
-rw-r--r--skillz/sk-tomnext-nc.yml (renamed from dan/sk-tomnext-nc.yml)0
-rw-r--r--skillz/sk-tomnext.yml (renamed from dan/sk-tomnext.yml)0
-rw-r--r--skillz/sk-torrent.yml (renamed from dan/sk-torrent.yml)0
-rw-r--r--skillz/usb-generate.yml10
-rw-r--r--skillz/usb-install.yml10
-rw-r--r--skillz/vm-deploy.yml18
-rw-r--r--skillz/vm-install.yml11
97 files changed, 201 insertions, 28 deletions
diff --git a/dan/cloud-install.yml b/elevate/cloud-install.yml
index 72db81d9..72db81d9 100644
--- a/dan/cloud-install.yml
+++ b/elevate/cloud-install.yml
diff --git a/dan/common.yml b/elevate/common.yml
index af4b4fda..af4b4fda 100644
--- a/dan/common.yml
+++ b/elevate/common.yml
diff --git a/dan/ele-calypso.yml b/elevate/ele-calypso.yml
index 5d8e51ce..5d8e51ce 100644
--- a/dan/ele-calypso.yml
+++ b/elevate/ele-calypso.yml
diff --git a/dan/ele-chromebook.yml b/elevate/ele-chromebook.yml
index 411c49b7..411c49b7 100644
--- a/dan/ele-chromebook.yml
+++ b/elevate/ele-chromebook.yml
diff --git a/dan/ele-companion-raspi.yml b/elevate/ele-companion-raspi.yml
index e16c4d70..e16c4d70 100644
--- a/dan/ele-companion-raspi.yml
+++ b/elevate/ele-companion-raspi.yml
diff --git a/dan/ele-coturn.yml b/elevate/ele-coturn.yml
index 4111f156..4111f156 100644
--- a/dan/ele-coturn.yml
+++ b/elevate/ele-coturn.yml
diff --git a/dan/ele-dione.yml b/elevate/ele-dione.yml
index 95800036..95800036 100644
--- a/dan/ele-dione.yml
+++ b/elevate/ele-dione.yml
diff --git a/dan/ele-dolmetsch-raspi.yml b/elevate/ele-dolmetsch-raspi.yml
index cbb2ca58..cbb2ca58 100644
--- a/dan/ele-dolmetsch-raspi.yml
+++ b/elevate/ele-dolmetsch-raspi.yml
diff --git a/dan/ele-emc-ctrl.yml b/elevate/ele-emc-ctrl.yml
index b24d8df4..b24d8df4 100644
--- a/dan/ele-emc-ctrl.yml
+++ b/elevate/ele-emc-ctrl.yml
diff --git a/dan/ele-emcplayer.yml b/elevate/ele-emcplayer.yml
index 0b9d7568..0b9d7568 100644
--- a/dan/ele-emcplayer.yml
+++ b/elevate/ele-emcplayer.yml
diff --git a/dan/ele-gwhetzner.yml b/elevate/ele-gwhetzner.yml
index 754fae65..754fae65 100644
--- a/dan/ele-gwhetzner.yml
+++ b/elevate/ele-gwhetzner.yml
diff --git a/dan/ele-helene.yml b/elevate/ele-helene.yml
index dda7134f..dda7134f 100644
--- a/dan/ele-helene.yml
+++ b/elevate/ele-helene.yml
diff --git a/dan/ele-hpws-maxi.yml b/elevate/ele-hpws-maxi.yml
index 1661de96..1661de96 100644
--- a/dan/ele-hpws-maxi.yml
+++ b/elevate/ele-hpws-maxi.yml
diff --git a/dan/ele-hpws-mini1.yml b/elevate/ele-hpws-mini1.yml
index 2d2690b6..2d2690b6 100644
--- a/dan/ele-hpws-mini1.yml
+++ b/elevate/ele-hpws-mini1.yml
diff --git a/dan/ele-hpws-mini2.yml b/elevate/ele-hpws-mini2.yml
index 83341a64..83341a64 100644
--- a/dan/ele-hpws-mini2.yml
+++ b/elevate/ele-hpws-mini2.yml
diff --git a/dan/ele-hyperion.yml b/elevate/ele-hyperion.yml
index 3402de41..3402de41 100644
--- a/dan/ele-hyperion.yml
+++ b/elevate/ele-hyperion.yml
diff --git a/dan/ele-jitsi.yml b/elevate/ele-jitsi.yml
index 7fd463d8..7fd463d8 100644
--- a/dan/ele-jitsi.yml
+++ b/elevate/ele-jitsi.yml
diff --git a/dan/ele-lt.yml b/elevate/ele-lt.yml
index 67eaafcd..67eaafcd 100644
--- a/dan/ele-lt.yml
+++ b/elevate/ele-lt.yml
diff --git a/dan/ele-media.yml b/elevate/ele-media.yml
index d22f91dd..d22f91dd 100644
--- a/dan/ele-media.yml
+++ b/elevate/ele-media.yml
diff --git a/dan/ele-router.yml b/elevate/ele-router.yml
index e160b57a..e160b57a 100644
--- a/dan/ele-router.yml
+++ b/elevate/ele-router.yml
diff --git a/dan/ele-stage-raspi.yml b/elevate/ele-stage-raspi.yml
index b19389c4..b19389c4 100644
--- a/dan/ele-stage-raspi.yml
+++ b/elevate/ele-stage-raspi.yml
diff --git a/dan/ele-tarvos.yml b/elevate/ele-tarvos.yml
index d034d970..d034d970 100644
--- a/dan/ele-tarvos.yml
+++ b/elevate/ele-tarvos.yml
diff --git a/dan/ele-telesto.yml b/elevate/ele-telesto.yml
index f8f7f55a..f8f7f55a 100644
--- a/dan/ele-telesto.yml
+++ b/elevate/ele-telesto.yml
diff --git a/dan/ele-thetys.yml b/elevate/ele-thetys.yml
index a1a259d2..a1a259d2 100644
--- a/dan/ele-thetys.yml
+++ b/elevate/ele-thetys.yml
diff --git a/dan/ele-tsdatacop.yml b/elevate/ele-tsdatacop.yml
index 949bbba2..949bbba2 100644
--- a/dan/ele-tsdatacop.yml
+++ b/elevate/ele-tsdatacop.yml
diff --git a/dan/ele-uhrturm.yml b/elevate/ele-uhrturm.yml
index 2b102803..2b102803 100644
--- a/dan/ele-uhrturm.yml
+++ b/elevate/ele-uhrturm.yml
diff --git a/dan/ele-winvm.yml b/elevate/ele-winvm.yml
index 1af6ad58..1af6ad58 100644
--- a/dan/ele-winvm.yml
+++ b/elevate/ele-winvm.yml
diff --git a/dan/ele-ymir.yml b/elevate/ele-ymir.yml
index ac94cbee..ac94cbee 100644
--- a/dan/ele-ymir.yml
+++ b/elevate/ele-ymir.yml
diff --git a/dan/emc-cdn.yml b/elevate/emc-cdn.yml
index 94697fdf..94697fdf 100644
--- a/dan/emc-cdn.yml
+++ b/elevate/emc-cdn.yml
diff --git a/dan/generic.yml b/elevate/generic.yml
index bc8866c5..bc8866c5 100644
--- a/dan/generic.yml
+++ b/elevate/generic.yml
diff --git a/elevate/group_vars/all.yml b/elevate/group_vars/all.yml
new file mode 100644
index 00000000..863c856e
--- /dev/null
+++ b/elevate/group_vars/all.yml
@@ -0,0 +1,12 @@
+$ANSIBLE_VAULT;1.2;AES256;elevate
+66366436633334323132373938653730316533353366326661393566646664386463373564313766
+3932306136616238376636303731636565623137323963320a306461373761653931393939323135
+65666234373531623434336434383366646366616561343934626635633066313861636230623337
+3766356432623363380a333034323539383064666537303337626539396635393135646263633161
+33373938333766656534316661623734663861623035646235303133316431303937343036363832
+38393039383538373965376637313566653430323930643333373036363064613430333064626163
+61313735623933663261653337613836376165333634663034653237663662316633363262373332
+34633436626630303064663834613135303864383562393233363139383662313766656261336162
+63363034383766353635613261366561376237653661633862356435373864313736366434663531
+32323466353832383461393635323564373664623761386533633135666262373436353731623663
+373163633037356130626137636463326266
diff --git a/dan/group_vars/ele-router.yml b/elevate/group_vars/ele-router.yml
index 84b07f1c..2793b6f0 100644
--- a/dan/group_vars/ele-router.yml
+++ b/elevate/group_vars/ele-router.yml
@@ -1,4 +1,4 @@
-$ANSIBLE_VAULT;1.2;AES256;dan
+$ANSIBLE_VAULT;1.2;AES256;elevate
62666535326238396536643861623335353861653832366661643937333335666332646138643564
6161623938663063656537373736323137306461616230370a326237633131656563323633323537
33346336666363646231353330616364303434346336643162303066653037613432396132653162
diff --git a/dan/group_vars/elevate-festival.yml b/elevate/group_vars/elevate-festival.yml
index dd1ea3ec..ea2cd4aa 100644
--- a/dan/group_vars/elevate-festival.yml
+++ b/elevate/group_vars/elevate-festival.yml
@@ -1,4 +1,4 @@
-$ANSIBLE_VAULT;1.2;AES256;dan
+$ANSIBLE_VAULT;1.2;AES256;elevate
39626666613066636362366536663934343261366635366638666365393065316437383064643139
3465316361303730323666336161363866656233333936340a383139373764393430306164356336
36653761636139613638376638623964313561303365346464353066616631336265633262313765
diff --git a/dan/group_vars/elevate-mediachannel.yml b/elevate/group_vars/elevate-mediachannel.yml
index e160cf54..4fb9a2eb 100644
--- a/dan/group_vars/elevate-mediachannel.yml
+++ b/elevate/group_vars/elevate-mediachannel.yml
@@ -1,4 +1,4 @@
-$ANSIBLE_VAULT;1.2;AES256;dan
+$ANSIBLE_VAULT;1.2;AES256;elevate
65333264376332373164623736623330633833626435636637343930633261313030396335306664
3431373866316237663335313438323836613266393939350a303239373562323664623838333339
66336338326639363137353136336364636264396332396165663763613666353532363938353332
diff --git a/dan/group_vars/elevate.yml b/elevate/group_vars/elevate.yml
index b9d7d29a..59f65c1f 100644
--- a/dan/group_vars/elevate.yml
+++ b/elevate/group_vars/elevate.yml
@@ -1,4 +1,4 @@
-$ANSIBLE_VAULT;1.2;AES256;dan
+$ANSIBLE_VAULT;1.2;AES256;elevate
61656330653064313535396131363439636234333566356439366133383737336366313264643861
3365633735666464393532303463646634386231656634640a326530316234383832343062336363
61393565616463306236353736653466353839306232646663623063663539393339633337383164
diff --git a/dan/group_vars/k8s-emc.yml b/elevate/group_vars/k8s-emc.yml
index 060be2eb..53ac56c6 100644
--- a/dan/group_vars/k8s-emc.yml
+++ b/elevate/group_vars/k8s-emc.yml
@@ -1,4 +1,4 @@
-$ANSIBLE_VAULT;1.2;AES256;dan
+$ANSIBLE_VAULT;1.2;AES256;elevate
61333930636361366561623133393666393566646538316464613834386236373463623762336335
6237333534653261376537366463633536636438616230610a663461346436326330303862313039
36343136376230306438633239303263326263383436333533373731656236396466363433636565
diff --git a/dan/host_vars/ele-calypso.yml b/elevate/host_vars/ele-calypso.yml
index 9f5414af..4daaaae9 100644
--- a/dan/host_vars/ele-calypso.yml
+++ b/elevate/host_vars/ele-calypso.yml
@@ -1,4 +1,4 @@
-$ANSIBLE_VAULT;1.2;AES256;dan
+$ANSIBLE_VAULT;1.2;AES256;elevate
37393363613766653939336635386264386434393136373236366330333131363764343633633639
6436353937376339383233313335396163663134373635650a653365666539313130613464383666
62623964383261303365366161373938366131366465366433636364356639333766313162303766
diff --git a/dan/host_vars/ele-coturn.yml b/elevate/host_vars/ele-coturn.yml
index 7574b0b4..3a21a255 100644
--- a/dan/host_vars/ele-coturn.yml
+++ b/elevate/host_vars/ele-coturn.yml
@@ -1,4 +1,4 @@
-$ANSIBLE_VAULT;1.2;AES256;dan
+$ANSIBLE_VAULT;1.2;AES256;elevate
33643766613664653232346436333636376564396235303135336164383263616335656464363862
6165653236323338323133316434636332396537666662320a333461656262333233313133626163
64366339353039373061393532333036636439383637653535343036303033666261386636653638
diff --git a/dan/host_vars/ele-gwhetzner.yml b/elevate/host_vars/ele-gwhetzner.yml
index 8b579bb0..2ce26e90 100644
--- a/dan/host_vars/ele-gwhetzner.yml
+++ b/elevate/host_vars/ele-gwhetzner.yml
@@ -1,4 +1,4 @@
-$ANSIBLE_VAULT;1.2;AES256;dan
+$ANSIBLE_VAULT;1.2;AES256;elevate
36343835316464333566383362316662323461393339643462653138303565333663373938663836
3764643539303864386532636539343461613063383865380a356237663837663931326266376131
62306631366466393736323764396539653661666363326335626439326430613537656363333163
diff --git a/dan/host_vars/ele-jitsi.yml b/elevate/host_vars/ele-jitsi.yml
index fb36ca68..2ca197a5 100644
--- a/dan/host_vars/ele-jitsi.yml
+++ b/elevate/host_vars/ele-jitsi.yml
@@ -1,4 +1,4 @@
-$ANSIBLE_VAULT;1.2;AES256;dan
+$ANSIBLE_VAULT;1.2;AES256;elevate
38373939316137333037336333356362653866633962323666643232323230333631666463633038
3434653263316531363431363164623637663862616439630a343632306266646339363864306333
33643433346637346366323036306537346633386461313861636662303138363265636630643337
diff --git a/dan/host_vars/ele-lt.yml b/elevate/host_vars/ele-lt.yml
index a6d92a74..ee4341c2 100644
--- a/dan/host_vars/ele-lt.yml
+++ b/elevate/host_vars/ele-lt.yml
@@ -1,4 +1,4 @@
-$ANSIBLE_VAULT;1.2;AES256;dan
+$ANSIBLE_VAULT;1.2;AES256;elevate
33623330323462663137623863303262373039363563663434373736646462616237616161353330
6438336330633039633134643230633036383631313535330a663439643563616631343337663336
33663165323636386435306438393534633339626232306464663238353634343238363965363765
diff --git a/dan/host_vars/ele-media.yml b/elevate/host_vars/ele-media.yml
index be3605aa..57da7067 100644
--- a/dan/host_vars/ele-media.yml
+++ b/elevate/host_vars/ele-media.yml
@@ -1,4 +1,4 @@
-$ANSIBLE_VAULT;1.2;AES256;dan
+$ANSIBLE_VAULT;1.2;AES256;elevate
32383030626365353437666338353362653263373234613333386537333465366536396533343739
6165663837376238636161386162373666313135376264370a346166363462323831346237393266
64666238656632323331356230363331316534626437326538636433336239626164616665383864
diff --git a/dan/image-generate.yml b/elevate/image-generate.yml
index 1b11f1eb..1b11f1eb 100644
--- a/dan/image-generate.yml
+++ b/elevate/image-generate.yml
diff --git a/dan/info-beamer.yml b/elevate/info-beamer.yml
index 6160e9f2..6160e9f2 100644
--- a/dan/info-beamer.yml
+++ b/elevate/info-beamer.yml
diff --git a/dan/iso-generate.yml b/elevate/iso-generate.yml
index 584b8914..584b8914 100644
--- a/dan/iso-generate.yml
+++ b/elevate/iso-generate.yml
diff --git a/dan/iso-install.yml b/elevate/iso-install.yml
index 5defe6d3..5defe6d3 100644
--- a/dan/iso-install.yml
+++ b/elevate/iso-install.yml
diff --git a/dan/k8s-emc.yml b/elevate/k8s-emc.yml
index 206c0211..206c0211 100644
--- a/dan/k8s-emc.yml
+++ b/elevate/k8s-emc.yml
diff --git a/dan/openwrt-deploy.yml b/elevate/openwrt-deploy.yml
index e7cc49fa..e7cc49fa 100644
--- a/dan/openwrt-deploy.yml
+++ b/elevate/openwrt-deploy.yml
diff --git a/dan/usb-generate.yml b/elevate/usb-generate.yml
index 7f633f1e..7f633f1e 100644
--- a/dan/usb-generate.yml
+++ b/elevate/usb-generate.yml
diff --git a/dan/usb-install.yml b/elevate/usb-install.yml
index 0f62bc85..0f62bc85 100644
--- a/dan/usb-install.yml
+++ b/elevate/usb-install.yml
diff --git a/dan/vm-deploy.yml b/elevate/vm-deploy.yml
index 8530b14a..8530b14a 100644
--- a/dan/vm-deploy.yml
+++ b/elevate/vm-deploy.yml
diff --git a/dan/vm-install.yml b/elevate/vm-install.yml
index da6a29a5..da6a29a5 100644
--- a/dan/vm-install.yml
+++ b/elevate/vm-install.yml
diff --git a/files/dan/elevate/elevatge_logo_white_sm.png b/files/elevate/elevatge_logo_white_sm.png
index e6457c08..e6457c08 100644
--- a/files/dan/elevate/elevatge_logo_white_sm.png
+++ b/files/elevate/elevatge_logo_white_sm.png
Binary files differ
diff --git a/files/dan/elevate/elevatge_turm_white_sm.png b/files/elevate/elevatge_turm_white_sm.png
index c3238ee0..c3238ee0 100644
--- a/files/dan/elevate/elevatge_turm_white_sm.png
+++ b/files/elevate/elevatge_turm_white_sm.png
Binary files differ
diff --git a/files/dan/elevate/info-beamer/branding.ppm b/files/elevate/info-beamer/branding.ppm
index 66b4996d..66b4996d 100644
--- a/files/dan/elevate/info-beamer/branding.ppm
+++ b/files/elevate/info-beamer/branding.ppm
Binary files differ
diff --git a/files/dan/elevate/info-beamer/e19-branding.jpg b/files/elevate/info-beamer/e19-branding.jpg
index 925b5d08..925b5d08 100644
--- a/files/dan/elevate/info-beamer/e19-branding.jpg
+++ b/files/elevate/info-beamer/e19-branding.jpg
Binary files differ
diff --git a/files/dan/elevate/info-beamer/e20-branding.jpg b/files/elevate/info-beamer/e20-branding.jpg
index 54c52f0d..54c52f0d 100644
--- a/files/dan/elevate/info-beamer/e20-branding.jpg
+++ b/files/elevate/info-beamer/e20-branding.jpg
Binary files differ
diff --git a/files/dan/elevate/info-beamer/e21-branding.jpg b/files/elevate/info-beamer/e21-branding.jpg
index 1a5111f0..1a5111f0 100644
--- a/files/dan/elevate/info-beamer/e21-branding.jpg
+++ b/files/elevate/info-beamer/e21-branding.jpg
Binary files differ
diff --git a/files/dan/elevate/info-beamer/e22-branding.jpg b/files/elevate/info-beamer/e22-branding.jpg
index 8db39ddd..8db39ddd 100644
--- a/files/dan/elevate/info-beamer/e22-branding.jpg
+++ b/files/elevate/info-beamer/e22-branding.jpg
Binary files differ
diff --git a/files/dan/elevate/info-beamer/e23-branding.jpg b/files/elevate/info-beamer/e23-branding.jpg
index cb1668f7..cb1668f7 100644
--- a/files/dan/elevate/info-beamer/e23-branding.jpg
+++ b/files/elevate/info-beamer/e23-branding.jpg
Binary files differ
diff --git a/files/dan/elevate/info-beamer/e24-branding.jpg b/files/elevate/info-beamer/e24-branding.jpg
index 08e828f7..08e828f7 100644
--- a/files/dan/elevate/info-beamer/e24-branding.jpg
+++ b/files/elevate/info-beamer/e24-branding.jpg
Binary files differ
diff --git a/gpg/get-vault-pass-dan b/gpg/get-vault-pass-elevate
index 37f60413..37f60413 100755
--- a/gpg/get-vault-pass-dan
+++ b/gpg/get-vault-pass-elevate
diff --git a/gpg/get-vault-pass-skillz b/gpg/get-vault-pass-skillz
new file mode 100755
index 00000000..37f60413
--- /dev/null
+++ b/gpg/get-vault-pass-skillz
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec "${BASH_SOURCE%/*}/get-vault-pass.sh" "${BASH_SOURCE##*/get-vault-pass-}"
diff --git a/gpg/vault-keyring-dan.gpg b/gpg/vault-keyring-elevate.gpg
index 5514efc9..5514efc9 100644
--- a/gpg/vault-keyring-dan.gpg
+++ b/gpg/vault-keyring-elevate.gpg
Binary files differ
diff --git a/gpg/vault-keyring-skillz.gpg b/gpg/vault-keyring-skillz.gpg
new file mode 100644
index 00000000..5514efc9
--- /dev/null
+++ b/gpg/vault-keyring-skillz.gpg
Binary files differ
diff --git a/gpg/vault-pass-dan.gpg b/gpg/vault-pass-elevate.gpg
index 862ef834..862ef834 100644
--- a/gpg/vault-pass-dan.gpg
+++ b/gpg/vault-pass-elevate.gpg
diff --git a/gpg/vault-pass-skillz.gpg b/gpg/vault-pass-skillz.gpg
new file mode 100644
index 00000000..862ef834
--- /dev/null
+++ b/gpg/vault-pass-skillz.gpg
@@ -0,0 +1,30 @@
+-----BEGIN PGP MESSAGE-----
+
+hQIMAwn6BEwlAdD6AQ//YV/o/+FbGxfjgK4IU8MGEzO9qRrvi5rS179ThBihQAoz
+dDueIBrpwJ0AgcxO4ktPZk86hrpet6QlpRYQcQfXV/3hN9Z5+DORIxmpyWWqTZPC
+0zD4MO7a0sgTYqSiBMyx/lsnNEzr47MRIt4oloaKrgvmct1dD/csjDCjE+CQt48+
+D7zu/QsYd6yyqr4zPLQ5y2N0SjsQLI/O+pns4ugiwOEAtzpAOgYoHah15B+VAjP4
+MVhjkeOYHSzfOSfaDxhlnFJwb/uZ9bI7BKFnvCnz9wnbq6iOCElwhaP3zgc80JtU
+sa5C76ivAZnhczDEElfirlYVVAL1pCH5LR6Vpo5UtwubVX2LGhU1UfpWF+ChS6/d
+H9yn8sKL5DV/2tS6Sry8deIHqEtL6vvLiyjDPXOpG1/473moadpC/YjWSnhmLh0G
+uc/vGWbMgaaYf8aKiv6QNYmHwwhKT0GoiDRFX2h1VjnuHzxKfA1xnn1f00uZBYcK
+/WG6nJuAZg4KaGIyiy0l6hP8z4ZSIGKZC6UdKPCRFqoSa1BH+wOqRji2uRy1KTJ1
+cglidBwhvdGOCFxbcjzJlhOAZlYf4b3hF9mmok5SyCrCn9MkvrSOIpOCCvOPkh/t
+enSmwA5EAnnqwtJl3scsanG4JciF3V1hU+f+T+ftf4Hoo1YUf44SdmWPiM+ssEiF
+AgwDPWJqFfpI23UBD/9pArJnxGl4l7pg6d+FfdIRnaw61rxuS1OZBIZdNY7rHXIe
+SQpzVUHMa1JvVlXlDeuTLhuFRKCjnib7ZB/M/wUOwqa+yvKLh5EjUiXXmj5E228o
+wb195WULqsbwURW85n5I2HBDRuMge91nQNSq1rt51bpBz5QoFKqBwIdoWQwA9Hzz
+SywWa2jL1a6J7X/jMx979+eRNk/7wxwuNTu/orz6i2V+uxuJJy6K5vo+xxb0xIoH
+YE3oKhcqhS2GM8dOJ55XO/lFau1dgkz/2W/o03aJViAokj8A6bUo5EzEzGCIhwTR
+YdBenvgW9yDcHEcwRj4cBhQ9yEgHcuhD1WUERm5EKbVy3A24n9PzdF32VZWOntVQ
+JIDAor5+7pbCLJmKsImPSdv5FbOcjRrP9+lyJeaJ21Jd3nVK2idV4CS/j7qU9b69
+r0ZZPspyffj6GzONKRvt0Dd1LQleBrPqMlnOwUo4o1aMobceVWlL3n1puvDENgZi
+LRd7vr7zSHfcBHcnygE7bhfkEewD4V3OJA2gcz+drALpZW2fySTtPbf4PFoD0FL9
+IGQ2qQWTb9FG2C+RK22yB++mp/AjO8AQ8ZmMZ8WFr0i3kUFfOcQJJLaTXEg4YkDp
+QqRcC2/9LOFY6VHcr/ZgYJfVRCdHrSKp2IZ9vf2j145fAtgNyWKbqyROdTNO5tK5
+AZYhXZUn+GqkAn0BWr8b8N5N2XChqXqVl+kBh4XIh0n8gRrLnqtdlmeUeiPnev2R
+7Pf1RN2U707M+fDNCRM96NaX+NjmIe0U0ZdILFRZBjmkUahU8+58AlmLHNwKMLox
+Z9PDfDafqPBpBnTpkfoWMd6NAWWx6/EomTXISsMMSknSKBYYI512fc3eedtBc405
+rQDrtS7CyzDbsARqP8VPkDqi4YG9nHiPnL2Zls5A89YuPtS/P8x1eaE=
+=Sf0S
+-----END PGP MESSAGE-----
diff --git a/inventory/group_vars/all/users.yml b/inventory/group_vars/all/users.yml
index 3fb26b34..0dce7e82 100644
--- a/inventory/group_vars/all/users.yml
+++ b/inventory/group_vars/all/users.yml
@@ -49,9 +49,6 @@ ssh_key_map:
chaos-at-home:
- ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDL8afqxWieebpxezBuLj2CIx/iAuTY9ziJt8JCJE0qYh+B2wXe9e+sPaKwz5yyS0X0MoEPHbYuVytxGQfGhdVR57gWWTYq5MBBFEqmu5MexAFKlNxad4TNQQwhs7rnI+lptKJO+rqeG/vaQBgao+61ZVwRR5Zr1zsXEoo5m4VB8VPo3TW0nSb97LdMyUmb1TaqDKJ5hrtrV6YcokXzE8FwHMK15oJsuJC7YUReijol3hGsRVw1H5S1zu4uDz7G32dPVxoLOPgupnf0SxnXdNVfNU50MHHSK68HzBXz4/rE1YLacRPloOhO7xegkWd5KGa09opEbUGzGu/lSXgHuAJpPgloy14cehDhLJ7F7SbXK4QBBtVgV+1CYXG2eJsRHIdkWiTWLuG+QZ4oEFLjQBjWpUYsEiDt9FEtSVCtKH2vBk26ps5yIoSCtYq6POvg9miGgcpQA6HHwh5ekVUaKRGWuMdAIvjvQSlCsFjYkxD1NpCgU1RhyWWTI3xTSKzTxcXiCWWZoBDJVoW46EpSvySsOpxL/hLxJwMR8ouc6cPRZZl3m51824Rv3LdEXNBmn3vnojzIvrOed3sxpD0+7+tbA4J1uTbAxtkOMhK94WXKiUAOD7e5bJYdzajvDD2T9tkj/Mqdo8z3iR2/yjkGMEAeWWVOQEh7QhQS7OFEAKK4fw== equinox@chaos-at-home.org
- ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBO6D6zd2fJiBiacdHFPQ99XadnS8GPjicYxL5+8Zjjb equinox@chaos-at-home.org
- dan:
- - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCwjCMiwyz7f0b1b6S5RjGbYXjd+hkTVsNzZ9xIkqqvdF8zCU6qZTqkhem13m6E1aPjALl0iyrmpb8N2pmASD7axUaTMTDd2tktkB3LULBbQCCApMnw5viZc9fm9dLBdbdiYyRtNrpk/b39V+9uViAbRtATBrYS5vV/14gT42WxPhpFiCz6A5JsKpmbBafS9vfexnqLTvKBtYLt+zhuS9eFovMHM5k7Qq4mRdKe+wdMBDeRls2z2G/ZjPrfHAkw2WctFUdSY+YAVzLB0SddVWnbOSZ19tsnzskyHpDD49LWb7wYl0OJ9fhxO02lnxW5Vdpwwwx8I7FVH83fDTQpzfSdr8tMY3F9rvCmi4noiTGDE2AAWqh73unKuydvBomNYX8HbuiJO9eTgwUIRAqsl8vHNU5rA10YF5r2SUqofrBNfINUH8x0NhpLGzNPIlazndaPY1no+XeQRQtgSU1bdDQzmySyyn5g9mlMSTU+jHfzyoK7yqlKE0W/R2ZTOEwr6+uRdFqn+mWmB0Mr20YavjVretseVs1AkmqaVClEO1juwb/CWI//Nd4uboD9zdZwkHmCjLlOmC+GkGrnLValaqQDh8iR8aKiVbaQVffl3ph1pD3BCn79KJy56YySLTbaI4lFDUHherkTdvgyMVmZJZMROzwuX7i4bi04TZ/GKTfDrw== equinox@elevate.at
- - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICU107TyOHAQjWTq6A05IiazdoOvzmrSOOgvjRiih/z+ equinox@elevate.at
spreadspace:
- ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCtmysXjBidEwJek6hBgaENiyVOwroFi19xRZZw+cYYqi6asDfF6B/h6gYNkJGWo0rD5ZaLdau1O210O5Xu+TfK1e2bZbxuFIj2fguUkat9wN6IQIO2m2Wcf4k/eiTmtAE3dp0l5ThMqfxxE8dj76mOOrUHCfJUIVoATGs4X5TLcGcXroAcZ+DFFoDzjxjFYNmIuUNtXDwXTpPc63SAYmRvW0ZYZlvH1qZ6irLh+GtE1dZ1Q5lQZvp6xUYcjInbpcd5Ko3KbG/In7sNmUCI7iaTwC4DPDTcHFj99Ll1jruAbdaQqe+ClZv55dbQ+92RDF6fsuQBD8FeRz7nYChvCqNPT1KOvcVsDtbW0iJ1PZ05QdE27w23wJj9OE0JWM09P3AH3ttswHaJ+P4s7mSxxK2m6YZcqop3czLlWWoGna0ynd5eV6l/rtvAQUvBOXjKQ5fPQY5d9cF0Z87NBE54HM9a/IKZ2toU2MuYNUpI/DUoAA9ILS4bJm3AUz8wbaC5EiuIhbM6I/u0NANamaQKRrolGNP4ETaQvhABs+S3/NSSBy4DMjtwax2BxyenF6i89vyHPNY+LZzBOn842yUlEGn6Z11MxiE5fhIfMPUclSYi5bQJDf1fvAyAo59/AX8sPqRK+/OCLIgLwdtW6D4OZGXjqrBJe2j/5uZSJEsl6ROyKw== equinox@spreadspace.org
- ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIPFw9I25dUMCMM66lIvt6VeBMhAX7tl4qvb7HxXQd8z equinox@spreadspace.org
@@ -64,3 +61,8 @@ ssh_key_map:
realraum:
- ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDj7AcnQZCRihToOI7/L5YslP4bkZlZwR2dg6hV8EfQ+37z1p0imhoqc2Oz/zIEgOVARBHkn5XmfR9Bu6e3YfKpXpJXC9O3jpRSw34Xac/8qXzWZsqVAXbtzvBlYA/G4j0NQM9XIVBa1ZzBZu87xeE4KUWzO80fnQ+G3GSBp28BM4TUiSOmX9y58chPZfUp2DE80fInoXv11ikLLCBDXfMkzFCZ4Gcexhr0TYcBUgLV7ufL0xqLg4yE+Z21PLtttvVYgZIers2nWetLPoREi5yDGKeCjJVyT00X2rp6h3eFkc/VaHfb5c2MY9/4BOt+cbFCx73sG0C1SnSzWd624K/8CEoJTsX4MazLLrxwi3hIwiYX1mCCfq4+S4PpSFvMUGdMWB52PkBRXulQislCVBA/lzma93xJr1jWVFSikjkvAUt8Zt33vHMRd7RMYDfsDVIEKpUT49cBj0v7zs6IVE858J33sUZoVXaiA2sjsap8RguNtjJMSYx8+nwkQAjxwlTiV2J6pHGQHJDyeVsqGlnMpEk32ZeSs/BQ7XWPG62FT3SN6E4C/fa8dawvs7RgY0cbZkhucECBu9Zto/KakIhzLtFzgDighPmK5SlAPoNEJLJYPo5ry2SBTysc4uV7xYZSQ6OVofeQeFXKL8oPe/ZAvKafn3Zk0mQcCtH0Z8q8iQ== equinox@realraum.at
- ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF70nrRNdkB/PnoKp+2nmjRavHIexOsS4IrC7Ah0bnwJ equinox@r3.at
+ elevate:
+ - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCwjCMiwyz7f0b1b6S5RjGbYXjd+hkTVsNzZ9xIkqqvdF8zCU6qZTqkhem13m6E1aPjALl0iyrmpb8N2pmASD7axUaTMTDd2tktkB3LULBbQCCApMnw5viZc9fm9dLBdbdiYyRtNrpk/b39V+9uViAbRtATBrYS5vV/14gT42WxPhpFiCz6A5JsKpmbBafS9vfexnqLTvKBtYLt+zhuS9eFovMHM5k7Qq4mRdKe+wdMBDeRls2z2G/ZjPrfHAkw2WctFUdSY+YAVzLB0SddVWnbOSZ19tsnzskyHpDD49LWb7wYl0OJ9fhxO02lnxW5Vdpwwwx8I7FVH83fDTQpzfSdr8tMY3F9rvCmi4noiTGDE2AAWqh73unKuydvBomNYX8HbuiJO9eTgwUIRAqsl8vHNU5rA10YF5r2SUqofrBNfINUH8x0NhpLGzNPIlazndaPY1no+XeQRQtgSU1bdDQzmySyyn5g9mlMSTU+jHfzyoK7yqlKE0W/R2ZTOEwr6+uRdFqn+mWmB0Mr20YavjVretseVs1AkmqaVClEO1juwb/CWI//Nd4uboD9zdZwkHmCjLlOmC+GkGrnLValaqQDh8iR8aKiVbaQVffl3ph1pD3BCn79KJy56YySLTbaI4lFDUHherkTdvgyMVmZJZMROzwuX7i4bi04TZ/GKTfDrw== equinox@elevate.at
+ - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICU107TyOHAQjWTq6A05IiazdoOvzmrSOOgvjRiih/z+ equinox@elevate.at
+ skillz:
+ - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKEjFaRBmI3JY12earMMxw7t8t4J4fGya8tb1AXUc/wm equinox@skillz.biz
diff --git a/inventory/group_vars/ele-infobeamer/vars.yml b/inventory/group_vars/ele-infobeamer/vars.yml
index 9aabdfd8..d2407fce 100644
--- a/inventory/group_vars/ele-infobeamer/vars.yml
+++ b/inventory/group_vars/ele-infobeamer/vars.yml
@@ -10,7 +10,7 @@ info_beamer_wireless:
info_beamer_prefer_wired: true
-info_beamer_branding_logo: "{{ global_files_dir }}/dan/elevate/info-beamer/branding.ppm"
-info_beamer_branding_background: "{{ global_files_dir }}/dan/elevate/info-beamer/e24-branding.jpg"
+info_beamer_branding_logo: "{{ global_files_dir }}/elevate/info-beamer/branding.ppm"
+info_beamer_branding_background: "{{ global_files_dir }}/elevate/info-beamer/e24-branding.jpg"
info_beamer_device_connect_key: "{{ vault_info_beamer_device_connect_key }}"
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 01d3eae3..0e57d9c5 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -1,3 +1,4 @@
+
[all:vars]
ansible_user=root
ansible_port=222
@@ -190,11 +191,11 @@ glt-telesto host_name=minion-glt
###############################
-# environment: dan
+# environment: skillz
[skillz:vars]
host_domain=skillz.biz
-env_group=dan
+env_group=skillz
[skillz]
sk-2019 host_name=2019
@@ -207,9 +208,12 @@ sk-testvm host_name=testvm
sk-torrent host_name=torrent
+###############################
+# environment: elevate
+
[elevate:vars]
host_domain=elev8.at
-env_group=dan
+env_group=elevate
[elevate]
ele-media host_name=media
@@ -283,7 +287,7 @@ ele-infobeamer-default
[elevate-mediachannel:vars]
host_domain=elev8.at
-env_group=dan
+env_group=elevate
[elevate-mediachannel]
ele-emc-ctrl host_name=emc-ctrl
diff --git a/skillz/cloud-install.yml b/skillz/cloud-install.yml
new file mode 100644
index 00000000..72db81d9
--- /dev/null
+++ b/skillz/cloud-install.yml
@@ -0,0 +1,10 @@
+---
+- name: cook variables for host
+ hosts: "{{ install_hostname }}"
+ gather_facts: no
+ tasks:
+ - set_fact:
+ install: "{{ install | default({}) }}"
+ network: "{{ network | default({}) }}"
+
+- import_playbook: ../common/cloud-install.yml
diff --git a/skillz/common.yml b/skillz/common.yml
new file mode 100644
index 00000000..af4b4fda
--- /dev/null
+++ b/skillz/common.yml
@@ -0,0 +1,10 @@
+---
+- name: Basic Setup
+ hosts: "{{ install_hostname }}"
+ roles:
+ - role: apt-repo/base
+ when: ansible_pkg_mgr == "apt"
+ - role: core/base
+ - role: core/sshd/base
+ - role: core/zsh
+ - role: core/ntp
diff --git a/skillz/generic.yml b/skillz/generic.yml
new file mode 100644
index 00000000..bc8866c5
--- /dev/null
+++ b/skillz/generic.yml
@@ -0,0 +1,5 @@
+---
+- name: "Apply role {{ myrole }} to hosts: {{ myhosts }}"
+ hosts: "{{ myhosts }}"
+ roles:
+ - role: "{{ myrole }}"
diff --git a/dan/group_vars/all.yml b/skillz/group_vars/all.yml
index 191025b4..bace9df0 100644
--- a/dan/group_vars/all.yml
+++ b/skillz/group_vars/all.yml
@@ -1,4 +1,4 @@
-$ANSIBLE_VAULT;1.2;AES256;dan
+$ANSIBLE_VAULT;1.2;AES256;skillz
39333835343437643137363564396365316439626562616635373336383136393961366164373439
6134633733313738636562666461653861346439323231300a343935313134326635643464626565
61643764393538666235356530633236366431313236646664323561633032353966633262376435
diff --git a/dan/host_vars/sk-2019.yml b/skillz/host_vars/sk-2019.yml
index 2882acd5..29633d0e 100644
--- a/dan/host_vars/sk-2019.yml
+++ b/skillz/host_vars/sk-2019.yml
@@ -1,4 +1,4 @@
-$ANSIBLE_VAULT;1.2;AES256;dan
+$ANSIBLE_VAULT;1.2;AES256;skillz
65356433653063643165336636353364333339626236303637353639346166623666333136663466
3637633166353765393636323931336338616435383736620a393565653533643732323661336433
36636164633535303531343362383439633038323539346331666333333964616164636362363666
diff --git a/dan/host_vars/sk-2019vm.yml b/skillz/host_vars/sk-2019vm.yml
index 3f728447..6ffcff58 100644
--- a/dan/host_vars/sk-2019vm.yml
+++ b/skillz/host_vars/sk-2019vm.yml
@@ -1,4 +1,4 @@
-$ANSIBLE_VAULT;1.2;AES256;dan
+$ANSIBLE_VAULT;1.2;AES256;skillz
31323764346661386139383032303266363633313764666462623534643433396631333062366631
3435663166366366663734383739323731356161623835300a666335373262383065636665646136
30653035393231643134623464383531623430633663666461306437383831326635363163623765
diff --git a/dan/host_vars/sk-cloudio.yml b/skillz/host_vars/sk-cloudio.yml
index 509ed672..8596b411 100644
--- a/dan/host_vars/sk-cloudio.yml
+++ b/skillz/host_vars/sk-cloudio.yml
@@ -1,4 +1,4 @@
-$ANSIBLE_VAULT;1.2;AES256;dan
+$ANSIBLE_VAULT;1.2;AES256;skillz
38373935316661656666663139653966636234643337653432343830376332386533323164323337
3066393834633363656537383433343365346330636136360a333462373465393939383634303439
36376238303837373763643235663330353662323165636233623534623065303961356630623536
diff --git a/dan/host_vars/sk-testvm.yml b/skillz/host_vars/sk-testvm.yml
index 033f490c..6081d56b 100644
--- a/dan/host_vars/sk-testvm.yml
+++ b/skillz/host_vars/sk-testvm.yml
@@ -1,4 +1,4 @@
-$ANSIBLE_VAULT;1.2;AES256;dan
+$ANSIBLE_VAULT;1.2;AES256;skillz
35666266336366353336306161626463373466323434316163653235623464626134316237333961
3139623939363464366539646365323136393939316333630a373365623838663038306438636537
63663830653332316132353033326638663332363636623131666266313065323430346634333339
diff --git a/dan/host_vars/sk-tomnext-nc.yml b/skillz/host_vars/sk-tomnext-nc.yml
index a1008b15..b7b7c529 100644
--- a/dan/host_vars/sk-tomnext-nc.yml
+++ b/skillz/host_vars/sk-tomnext-nc.yml
@@ -1,4 +1,4 @@
-$ANSIBLE_VAULT;1.2;AES256;dan
+$ANSIBLE_VAULT;1.2;AES256;skillz
38303565323764636435626633373138303637383839656366303532313266356665306666376534
6566623963643964613133306334396336333566646631310a366430303430306563626530323636
64316438663337653135353935373038393931393261653133336164383436653665666132383233
diff --git a/dan/host_vars/sk-tomnext.yml b/skillz/host_vars/sk-tomnext.yml
index fc3ea2c6..2e8aec35 100644
--- a/dan/host_vars/sk-tomnext.yml
+++ b/skillz/host_vars/sk-tomnext.yml
@@ -1,4 +1,4 @@
-$ANSIBLE_VAULT;1.2;AES256;dan
+$ANSIBLE_VAULT;1.2;AES256;skillz
32633430643636636263663937653962346365323663323335326366363134386163373532643666
3462383534633339623538646230653639393534343536360a343665316266613464333066626631
36393863383832303761386566343430343138343230643761623761396239633839666266356265
diff --git a/dan/host_vars/sk-torrent.yml b/skillz/host_vars/sk-torrent.yml
index c95d5807..18a8fa1e 100644
--- a/dan/host_vars/sk-torrent.yml
+++ b/skillz/host_vars/sk-torrent.yml
@@ -1,4 +1,4 @@
-$ANSIBLE_VAULT;1.2;AES256;dan
+$ANSIBLE_VAULT;1.2;AES256;skillz
37333061623432316463656165303235356636626364393138613735333631646137313866383866
6236313162353066383439613737393934616638316637370a626434626230373836313963336234
33636230396235313934646634373034616564656339653066656166353936643236346235333038
diff --git a/skillz/image-generate.yml b/skillz/image-generate.yml
new file mode 100644
index 00000000..1b11f1eb
--- /dev/null
+++ b/skillz/image-generate.yml
@@ -0,0 +1,20 @@
+---
+- name: generate os image
+ hosts: "{{ install_hostnames }}"
+ connection: local
+ gather_facts: no
+ roles:
+ - role: "installer/{{ install_distro }}/image"
+ post_tasks:
+ - pause:
+ seconds: 0
+ prompt: |
+ The resulting images can be found here:
+
+ {% for host in play_hosts %}
+ {{ host }}:
+ {% for image in hostvars[host].output_images %}
+ - {{ image }}
+ {% endfor %}
+
+ {% endfor %}
diff --git a/skillz/iso-generate.yml b/skillz/iso-generate.yml
new file mode 100644
index 00000000..584b8914
--- /dev/null
+++ b/skillz/iso-generate.yml
@@ -0,0 +1,10 @@
+---
+- name: cook variables for host
+ hosts: "{{ install_hostnames }}"
+ gather_facts: no
+ tasks:
+ - set_fact:
+ install: "{{ install | default({}) }}"
+ network: "{{ network | default({}) }}"
+
+- import_playbook: ../common/iso-generate.yml
diff --git a/skillz/iso-install.yml b/skillz/iso-install.yml
new file mode 100644
index 00000000..5defe6d3
--- /dev/null
+++ b/skillz/iso-install.yml
@@ -0,0 +1,10 @@
+---
+- name: cook variables for host
+ hosts: "{{ install_hostname }}"
+ gather_facts: no
+ tasks:
+ - set_fact:
+ install: "{{ install | default({}) }}"
+ network: "{{ network | default({}) }}"
+
+- import_playbook: ../common/iso-install.yml
diff --git a/skillz/openwrt-deploy.yml b/skillz/openwrt-deploy.yml
new file mode 100644
index 00000000..e7cc49fa
--- /dev/null
+++ b/skillz/openwrt-deploy.yml
@@ -0,0 +1,9 @@
+---
+- name: generate os image
+ hosts: "{{ install_hostname }}"
+ connection: local
+ gather_facts: no
+ roles:
+ - role: installer/openwrt/image
+
+- import_playbook: ../common/openwrt-deploy.yml
diff --git a/dan/sk-2019.yml b/skillz/sk-2019.yml
index 3d555ba5..3d555ba5 100644
--- a/dan/sk-2019.yml
+++ b/skillz/sk-2019.yml
diff --git a/dan/sk-2019vm.yml b/skillz/sk-2019vm.yml
index d7c42245..d7c42245 100644
--- a/dan/sk-2019vm.yml
+++ b/skillz/sk-2019vm.yml
diff --git a/dan/sk-cloudio.yml b/skillz/sk-cloudio.yml
index 15e8bfec..15e8bfec 100644
--- a/dan/sk-cloudio.yml
+++ b/skillz/sk-cloudio.yml
diff --git a/dan/sk-testvm.yml b/skillz/sk-testvm.yml
index 74ba2053..74ba2053 100644
--- a/dan/sk-testvm.yml
+++ b/skillz/sk-testvm.yml
diff --git a/dan/sk-tomnext-hp.yml b/skillz/sk-tomnext-hp.yml
index b0c38093..b0c38093 100644
--- a/dan/sk-tomnext-hp.yml
+++ b/skillz/sk-tomnext-hp.yml
diff --git a/dan/sk-tomnext-nc.yml b/skillz/sk-tomnext-nc.yml
index 9b756a18..9b756a18 100644
--- a/dan/sk-tomnext-nc.yml
+++ b/skillz/sk-tomnext-nc.yml
diff --git a/dan/sk-tomnext.yml b/skillz/sk-tomnext.yml
index 8ad69918..8ad69918 100644
--- a/dan/sk-tomnext.yml
+++ b/skillz/sk-tomnext.yml
diff --git a/dan/sk-torrent.yml b/skillz/sk-torrent.yml
index e6a176c1..e6a176c1 100644
--- a/dan/sk-torrent.yml
+++ b/skillz/sk-torrent.yml
diff --git a/skillz/usb-generate.yml b/skillz/usb-generate.yml
new file mode 100644
index 00000000..7f633f1e
--- /dev/null
+++ b/skillz/usb-generate.yml
@@ -0,0 +1,10 @@
+---
+- name: cook variables for host
+ hosts: "{{ install_hostnames }}"
+ gather_facts: no
+ tasks:
+ - set_fact:
+ install: "{{ install | default({}) }}"
+ network: "{{ network | default({}) }}"
+
+- import_playbook: ../common/usb-generate.yml
diff --git a/skillz/usb-install.yml b/skillz/usb-install.yml
new file mode 100644
index 00000000..0f62bc85
--- /dev/null
+++ b/skillz/usb-install.yml
@@ -0,0 +1,10 @@
+---
+- name: cook variables for host
+ hosts: "{{ install_hostname }}"
+ gather_facts: no
+ tasks:
+ - set_fact:
+ install: "{{ install | default({}) }}"
+ network: "{{ network | default({}) }}"
+
+- import_playbook: ../common/usb-install.yml
diff --git a/skillz/vm-deploy.yml b/skillz/vm-deploy.yml
new file mode 100644
index 00000000..8530b14a
--- /dev/null
+++ b/skillz/vm-deploy.yml
@@ -0,0 +1,18 @@
+---
+- name: generate os image
+ hosts: "{{ install_hostname }}"
+ connection: local
+ gather_facts: no
+ roles:
+ - role: "installer/{{ install_distro }}/image"
+
+- name: cook variables for host
+ hosts: "{{ install_hostname }}"
+ gather_facts: no
+ tasks:
+ - set_fact:
+ install: "{{ install | default({}) }}"
+ network: "{{ network | default({}) }}"
+ vm_host: "{{ vm_host | default({}) }}"
+
+- import_playbook: ../common/vm-deploy.yml
diff --git a/skillz/vm-install.yml b/skillz/vm-install.yml
new file mode 100644
index 00000000..da6a29a5
--- /dev/null
+++ b/skillz/vm-install.yml
@@ -0,0 +1,11 @@
+---
+- name: cook variables for host
+ hosts: "{{ install_hostname }}"
+ gather_facts: no
+ tasks:
+ - set_fact:
+ install: "{{ install | default({}) }}"
+ network: "{{ network | default({}) }}"
+ vm_host: "{{ vm_host | default({}) }}"
+
+- import_playbook: ../common/vm-install.yml