9 files changed, 62 insertions, 33 deletions

diff --git a/dan/emc-00.yml b/dan/emc-00.yml
new file mode 100644
index 00000000..2238f0c4
--- /dev/null
+++ b/dan/emc-00.yml
@@ -0,0 +1,11 @@
+---
+- name: Basic Setup
+  hosts: emc-00
+  roles:
+  - role: base
+  - role: sshd
+  - role: zsh
+  - role: apt-repo/spreadspace
+  - role: acmetool/base
+  - role: acmetool/cert
+    acmetool_cert_name: "{{ host_name }}.{{ host_domain }}"
diff --git a/dan/emc-01.yml b/dan/emc-01.yml
new file mode 100644
index 00000000..d8582867
--- /dev/null
+++ b/dan/emc-01.yml
@@ -0,0 +1,11 @@
+---
+- name: Basic Setup
+  hosts: emc-01
+  roles:
+  - role: base
+  - role: sshd
+  - role: zsh
+  - role: apt-repo/spreadspace
+  - role: acmetool/base
+  - role: acmetool/cert
+    acmetool_cert_name: "{{ host_name }}.{{ host_domain }}"
diff --git a/dan/emc-02.yml b/dan/emc-02.yml
new file mode 100644
index 00000000..78b4737a
--- /dev/null
+++ b/dan/emc-02.yml
@@ -0,0 +1,11 @@
+---
+- name: Basic Setup
+  hosts: emc-02
+  roles:
+  - role: base
+  - role: sshd
+  - role: zsh
+  - role: apt-repo/spreadspace
+  - role: acmetool/base
+  - role: acmetool/cert
+    acmetool_cert_name: "{{ host_name }}.{{ host_domain }}"
diff --git a/dan/emc-03.yml b/dan/emc-03.yml
new file mode 100644
index 00000000..87814119
--- /dev/null
+++ b/dan/emc-03.yml
@@ -0,0 +1,11 @@
+---
+- name: Basic Setup
+  hosts: emc-03
+  roles:
+  - role: base
+  - role: sshd
+  - role: zsh
+  - role: apt-repo/spreadspace
+  - role: acmetool/base
+  - role: acmetool/cert
+    acmetool_cert_name: "{{ host_name }}.{{ host_domain }}"
diff --git a/dan/emc-dist.yml b/dan/emc-dist.yml
index d9796969..0e2318f4 100644
--- a/dan/emc-dist.yml
+++ b/dan/emc-dist.yml
@@ -2,7 +2,6 @@
 - name: Basic Setup
   hosts: emc-dist
   roles:
-  - role: slim/hetzner
   - role: base
   - role: sshd
   - role: zsh
diff --git a/dan/emc-dist0.yml b/dan/emc-dist0.yml
new file mode 100644
index 00000000..9efb2731
--- /dev/null
+++ b/dan/emc-dist0.yml
@@ -0,0 +1,7 @@
+---
+- name: Basic Setup
+  hosts: emc-dist0
+  roles:
+  - role: base
+  - role: sshd
+  - role: zsh
diff --git a/dan/emc-xx.yml b/dan/emc-xx.yml
index f1a57b2c..7b80f76e 100644
--- a/dan/emc-xx.yml
+++ b/dan/emc-xx.yml
@@ -1,12 +1,10 @@
 ---
 - name: Basic Setup
-  hosts: emc-xx:!emc-00
+  hosts: emc-xx
   roles:
-  - role: slim/hetzner
   - role: base
   - role: sshd
   - role: zsh
-  - role: admin-user
   - role: apt-repo/spreadspace
   - role: acmetool/base
   - role: acmetool/cert
diff --git a/dan/emc_acmehack.yml b/dan/emc_acmehack.yml
deleted file mode 100644
index dd66d35c..00000000
--- a/dan/emc_acmehack.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-- name: create certificates for host
-  hosts: emc-xx:helene
-  vars:
-    acmetool_directory_server: "{{ acmetool_directory_server_le_live_v1 }}"
-  roles:
-  - role: acmetool/base
-  - role: acmetool/cert
-    acmetool_cert_name: "{{ inventory_hostname }}"
-    acmetool_cert_hostnames:
-    - "{{ inventory_hostname }}.spreadspace.org"
-
-- name: create certificates for names running on emc-00
-  hosts: emc-00
-  roles:
-  - role: acmetool/cert
-    acmetool_cert_name: emc
-    acmetool_cert_hostnames:
-    - stream.elevate.at
-    - elevate-live.spreadspace.org
-    - elevate-stats.spreadspace.org
-
-- name: create certificates for names running on helene
-  hosts: emc-helene
-  roles:
-  - role: acmetool/cert
-    acmetool_cert_name: emc
-    acmetool_cert_hostnames:
-    - elevate-feed.spreadspace.org
diff --git a/dan/group_vars/emc.yml b/dan/group_vars/emc.yml
new file mode 100644
index 00000000..a8c4004f
--- /dev/null
+++ b/dan/group_vars/emc.yml
@@ -0,0 +1,10 @@
+$ANSIBLE_VAULT;1.2;AES256;dan
+62373236353033346534363864356138396637653435313339373964323334386465323634303863
+6132306331343566333838386530326332353037393637660a643534326336383665306230316237
+64633266336233306661663231333031663933373432353139323163373932323930393636373035
+6238346263333632660a646533653935633964326439386237303838613166383331393534383566
+36336662346632326663633734656435396339343264363733343434323061623438663662343866
+33643237623235356431303638323836633137383334363830623565396161623563623439663762
+35356135666465366463336564343730616633383863313833303830333464356234383339363334
+61613331663264356462396165663565303463333932363331386134663230363262393664346161
+6133