Merge branch 'topic/zfs-buster-backports'

6 files changed, 98 insertions, 0 deletions

diff --git a/dan/host_vars/sk-tomnext-nc.yml b/dan/host_vars/sk-tomnext-nc.yml
new file mode 100644
index 00000000..4d3758a1
--- /dev/null
+++ b/dan/host_vars/sk-tomnext-nc.yml
@@ -0,0 +1,14 @@
+$ANSIBLE_VAULT;1.2;AES256;dan
+31356637373366366135373964373331383431333233356234613565616139666262393362636261
+3664303764633061666262326134656162346438303634610a303434636562376435333733633164
+35323734313462363936386231363962643631313033363766323230633134616532373639373936
+3439646464326230380a353638343834303036353335396236626239393330393466383064306266
+36396631393366333932323761343933316266386632363032656566343530323236353539313763
+39353463333466373335313230623361393434353939623039646235346566306535613865363263
+38313432633632316435373139333263636635636563356266396434373733313538643865363939
+62343862336666393261383336376163373038623165313966643839626166613066323536646135
+66646565323135656665316263653132633432306630386262313933666435316435663436363865
+39643965353664376237636266623437336339376465333834663139656630633731383762313766
+66306437396437623938353734646161373534646362666639646138663264333830633332386130
+61616231346561346332326637373864303562626538313461386238626435356665373766303535
+3966
diff --git a/dan/host_vars/sk-tomnext.yml b/dan/host_vars/sk-tomnext.yml
new file mode 100644
index 00000000..cc9eda31
--- /dev/null
+++ b/dan/host_vars/sk-tomnext.yml
@@ -0,0 +1,21 @@
+$ANSIBLE_VAULT;1.2;AES256;dan
+64623637363864333635663161656561306662333266613733373033383336326364623534363039
+6231636266303035623261613365613364353532316233390a646463373462363339313239313961
+31363961646463373761346664333937646265333433623132383236643033613666656562303932
+3564313234396433620a633739653966336139333239636363383139383066616662666336616566
+64666365373530633363633238313163333634643339356261373364396263376662386239303037
+34613233323532623130316538623339323833346236393432646238656265666363363635336331
+61626536633837646361313865313735653135313533386534303664393562333461393133616534
+64356432303863663236326232326365323165383761663233396664653964376363626630616663
+61356331626465396430656432613731623032396438303736623663383363643762313431343337
+30363039306264356536346464666262663733393966313132653161376334353763623664396134
+36323135656133393664616535646338323033363666386464336566643836306433633665336332
+38363032363237356336343064666363323638346262623834323530623734343033336632393431
+64646462383364346430326338313730626533346437333135656262333036376133636533353365
+38613133633034653165343437373637353366323438383862383065353363646337643435383334
+35346431353765303866383532386263353930383466323439386466633438643535663935373834
+37653430663331313935633066633862316337666430373164643133316139633133663934303232
+34633836373931373363316334373634363430653436366433393235336566346532663739353033
+31623432323731393966613838366564613661336433386463306538343834656463653831656462
+39383031343038373734313064316638623361343339623130326333303166346263353230323437
+37353666633036386130
diff --git a/dan/sk-2019vm.yml b/dan/sk-2019vm.yml
index 6479636d..0aa1ed31 100644
--- a/dan/sk-2019vm.yml
+++ b/dan/sk-2019vm.yml
@@ -9,6 +9,8 @@
   - role: admin-user
   - role: cryptdisk
   - role: zfs/base
+  - role: apt-repo/spreadspace
+  - role: zfs/sanoid
   - role: vm/host
   - role: installer/debian/base
   tasks:
@@ -25,6 +27,8 @@
         {% endfor %}
         systemctl restart zfs-import-cache.service
         systemctl restart zfs-mount.service
+        systemctl restart zfs-share.service
+        systemctl restart zfs-zed.service
         mount -a
 
         sleep 2
diff --git a/dan/sk-tomnext-hp.yml b/dan/sk-tomnext-hp.yml
new file mode 100644
index 00000000..b0c38093
--- /dev/null
+++ b/dan/sk-tomnext-hp.yml
@@ -0,0 +1,6 @@
+---
+- name: do nothing
+  hosts: sk-tomnext-hp
+  tasks:
+  - debug:
+      msg: this host is not managed by ansible ... nothing to do here
diff --git a/dan/sk-tomnext-nc.yml b/dan/sk-tomnext-nc.yml
new file mode 100644
index 00000000..ff475fb9
--- /dev/null
+++ b/dan/sk-tomnext-nc.yml
@@ -0,0 +1,18 @@
+---
+- name: Basic Setup
+  hosts: sk-tomnext-nc
+  roles:
+  - role: base
+  - role: sshd
+  - role: zsh
+  - role: apt-repo/base
+  - role: admin-user
+  - role: zfs/base
+  - role: apt-repo/spreadspace
+  - role: zfs/sanoid
+  - role: kubernetes/base
+  - role: kubernetes/standalone
+  - role: acmetool/base
+  - role: nginx/base
+  - role: apps/nextcloud
+  - role: apps/collabora/code
diff --git a/dan/sk-tomnext.yml b/dan/sk-tomnext.yml
new file mode 100644
index 00000000..d5d0fec6
--- /dev/null
+++ b/dan/sk-tomnext.yml
@@ -0,0 +1,35 @@
+---
+- name: Basic Setup
+  hosts: sk-tomnext
+  roles:
+  - role: base
+  - role: sshd
+  - role: zsh
+  - role: apt-repo/base
+  - role: admin-user
+  - role: cryptdisk
+  - role: zfs/base
+  - role: apt-repo/spreadspace
+  - role: zfs/sanoid
+  - role: vm/host
+  - role: installer/debian/base
+  tasks:
+  - name: install post-boot script
+    copy:
+      dest: /usr/local/bin/post-boot
+      mode: 0755
+      content: |
+        #!/bin/bash
+        set -e
+
+        {% for name, volume in  cryptdisk_volumes.items() %}
+        cryptsetup luksOpen '{{ volume.device }}' '{{ name }}'
+        {% endfor %}
+        systemctl restart zfs-import-cache.service
+        systemctl restart zfs-mount.service
+        systemctl restart zfs-share.service
+        systemctl restart zfs-zed.service
+        mount -a
+
+        sleep 2
+        systemctl restart libvirtd.service