debian keys über url und id

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   

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"

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"
 

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"

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: 

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"