summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2020-05-17 03:06:35 +0200
committerChristian Pointner <equinox@spreadspace.org>2020-05-17 03:06:35 +0200
commitd8faf841748f3499bee3579db8377bbcbce53cc3 (patch)
tree8ef03b23dd733f4b622f47b47edb0d7e22d212cb
parentsk-cloudia uses docker now (diff)
apt-repo/base for sk-2019vm
-rw-r--r--dan/sk-2019vm.yml1
-rw-r--r--inventory/host_vars/sk-2019vm.yml5
-rw-r--r--roles/apt-repo/base/tasks/main.yml3
3 files changed, 7 insertions, 2 deletions
diff --git a/dan/sk-2019vm.yml b/dan/sk-2019vm.yml
index cca2da5f..6479636d 100644
--- a/dan/sk-2019vm.yml
+++ b/dan/sk-2019vm.yml
@@ -5,6 +5,7 @@
- role: base
- role: sshd
- role: zsh
+ - role: apt-repo/base
- role: admin-user
- role: cryptdisk
- role: zfs/base
diff --git a/inventory/host_vars/sk-2019vm.yml b/inventory/host_vars/sk-2019vm.yml
index 2558f2e3..4584813e 100644
--- a/inventory/host_vars/sk-2019vm.yml
+++ b/inventory/host_vars/sk-2019vm.yml
@@ -11,6 +11,11 @@ network: {}
base_intel_nic_stability_fix: true
+apt_repo_components:
+- main
+- contrib ## for zfs
+- non-free ## for microcode updates
+
vm_host:
network:
dns:
diff --git a/roles/apt-repo/base/tasks/main.yml b/roles/apt-repo/base/tasks/main.yml
index 44110380..a58a9c5b 100644
--- a/roles/apt-repo/base/tasks/main.yml
+++ b/roles/apt-repo/base/tasks/main.yml
@@ -6,9 +6,8 @@
notify: update apt cache
## aptitude is needed for package upgrade roles
-- name: install aptitude and https transport
+- name: install aptitude
apt:
name:
- aptitude
- - apt-transport-https
state: present