summaryrefslogtreecommitdiff
path: root/roles
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2020-04-28 10:21:38 +0200
committerChristian Pointner <equinox@spreadspace.org>2020-04-28 10:21:38 +0200
commit1a7b03382533410c8b10d44ad8d522086f199cdb (patch)
treea91047c4dbfc36bce4ceaa54199e0898923c89b9 /roles
parentcloudia: upgradea all nextcloud instances (diff)
no more meta
Diffstat (limited to 'roles')
-rw-r--r--roles/wireguard/base/meta/main.yml4
-rw-r--r--roles/wireguard/base/tasks/main.yml4
-rw-r--r--roles/zfs/base/meta/main.yml3
-rw-r--r--roles/zfs/base/tasks/Debian.yml4
4 files changed, 8 insertions, 7 deletions
diff --git a/roles/wireguard/base/meta/main.yml b/roles/wireguard/base/meta/main.yml
deleted file mode 100644
index 3542c2fa..00000000
--- a/roles/wireguard/base/meta/main.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-dependencies:
-- role: prepare-dkms
-- role: apt-repo/spreadspace
diff --git a/roles/wireguard/base/tasks/main.yml b/roles/wireguard/base/tasks/main.yml
index 11761c33..6b7cea23 100644
--- a/roles/wireguard/base/tasks/main.yml
+++ b/roles/wireguard/base/tasks/main.yml
@@ -1,4 +1,8 @@
---
+- name: install dkms
+ import_role:
+ name: prepare-dkms
+
- name: install wireguard packages
apt:
name:
diff --git a/roles/zfs/base/meta/main.yml b/roles/zfs/base/meta/main.yml
deleted file mode 100644
index 300d0ccf..00000000
--- a/roles/zfs/base/meta/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-dependencies:
-- role: prepare-dkms
diff --git a/roles/zfs/base/tasks/Debian.yml b/roles/zfs/base/tasks/Debian.yml
index 450d9300..b9fdda95 100644
--- a/roles/zfs/base/tasks/Debian.yml
+++ b/roles/zfs/base/tasks/Debian.yml
@@ -1,4 +1,8 @@
---
+- name: install dkms
+ import_role:
+ name: prepare-dkms
+
## TODO: make sure contrib repo is enabled
- name: install zfs-dkms