From ac815a18cabc36ddf466135e68a1f8ad3abc0d02 Mon Sep 17 00:00:00 2001
From: Christian Elberfeld <christian.elberfeld@adesso.de>
Date: Wed, 14 Nov 2018 11:52:14 +0100
Subject: [PATCH] =?UTF-8?q?debian=20keys=20=C3=BCber=20url=20und=20id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
all/common/tasks/main.yml | 13 ++++++++++---
host_vars/vorstand | 7 ++++++-
host_vars/warphab | 4 +++-
host_vars/warpsrvext | 4 +++-
host_vars/warpsrvint | 4 +++-
host_vars/webserver | 4 +++-
6 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/all/common/tasks/main.yml b/all/common/tasks/main.yml
index e54621b2..6a35b3ec 100644
--- a/all/common/tasks/main.yml
+++ b/all/common/tasks/main.yml
@@ -12,12 +12,19 @@
with_items:
- apt-transport-https
-- name: add debian repo keys
+- name: add debian repo keys (id)
+ apt_key:
+ id: "{{ item }}"
+ state: present
+ with_items: "{{ debian_keys_id }}"
+ when: debian_keys_id
+
+- name: add debian repo keys (url)
apt_key:
url: "{{ item }}"
state: present
- with_items: "{{ debian_keys }}"
- when: debian_keys
+ with_items: "{{ debian_keys_url }}"
+ when: debian_keys_url
- name: set debian repos
template: src=sources.list.j2 dest=/etc/apt/sources.list
diff --git a/host_vars/vorstand b/host_vars/vorstand
index 0fe7d6d9..13106279 100644
--- a/host_vars/vorstand
+++ b/host_vars/vorstand
@@ -8,10 +8,15 @@ motd_lines:
debian_sources:
- "deb http://repo.myloc.de/debian stretch main non-free contrib"
- "deb https://download.docker.com/linux/debian stretch stable"
+ - "deb http://packages.x2go.org/debian stretch main"
-debian_keys:
+debian_keys_id:
+ - "E1F958385BFE2B6E" # x2go repo key
+
+debian_keys_url:
- "https://download.docker.com/linux/debian/gpg"
+
administratorenteam:
- "sandhome"
- "sandmobil"
diff --git a/host_vars/warphab b/host_vars/warphab
index b14fd642..deef8ea9 100644
--- a/host_vars/warphab
+++ b/host_vars/warphab
@@ -10,7 +10,9 @@ debian_sources:
- "deb https://homegear.eu/packages/Raspbian/ jessie/"
- "deb http://dl.bintray.com/openhab/apt-repo2 testing main"
-debian_keys:
+debian_keys_id:
+
+debian_keys_url:
- "https://homegear.eu/packages/Release.key"
- "https://bintray.com/user/downloadSubjectPublicKey?username=openhab"
diff --git a/host_vars/warpsrvext b/host_vars/warpsrvext
index 3691f954..fccc4605 100644
--- a/host_vars/warpsrvext
+++ b/host_vars/warpsrvext
@@ -10,7 +10,9 @@ debian_sources:
- "deb http://security.debian.org/ jessie/updates main contrib non-free"
- "deb http://ftp.debian.org/debian jessie-backports main"
-debian_keys:
+debian_keys_id:
+
+debian_keys_url:
administratorenteam:
- "void"
diff --git a/host_vars/warpsrvint b/host_vars/warpsrvint
index 741dfea3..0d879ca8 100644
--- a/host_vars/warpsrvint
+++ b/host_vars/warpsrvint
@@ -13,7 +13,9 @@ debian_sources:
- "deb https://apt.dockerproject.org/repo debian-jessie main"
- "deb [arch=amd64] https://download.docker.com/linux/debian jessie stable"
-debian_keys:
+debian_keys_id:
+
+debian_keys_url:
- "https://download.docker.com/linux/debian/gpg"
webserver_domains:
diff --git a/host_vars/webserver b/host_vars/webserver
index 706af93e..38c6e9a2 100644
--- a/host_vars/webserver
+++ b/host_vars/webserver
@@ -12,7 +12,9 @@ debian_sources:
- "deb http://ftp.halifax.rwth-aachen.de/debian/ stretch-updates main contrib non-free"
- "deb [arch=amd64] https://download.docker.com/linux/debian stretch stable"
-debian_keys:
+debian_keys_id:
+
+debian_keys_url:
- "https://download.docker.com/linux/debian/gpg"
--
GitLab