summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2019-09-25 15:32:36 +0200
committerTrygve Laugstøl <trygvis@inamo.no>2019-09-25 15:32:36 +0200
commit3548cb8b8bc9c8a83a7e7612f8c605aa04e859fe (patch)
tree2867280916ba06e2fc62d7506793cf8ef2e05895
parent21033c75440906c3a8e36c1266e114a8c4177e08 (diff)
downloadinfra-3548cb8b8bc9c8a83a7e7612f8c605aa04e859fe.tar.gz
infra-3548cb8b8bc9c8a83a7e7612f8c605aa04e859fe.tar.bz2
infra-3548cb8b8bc9c8a83a7e7612f8c605aa04e859fe.tar.xz
infra-3548cb8b8bc9c8a83a7e7612f8c605aa04e859fe.zip
o Skype: adding key url.
-rw-r--r--ansible/group_vars/all/apt-repos.yml6
-rw-r--r--ansible/group_vars/workstation/apt-repos.yml2
2 files changed, 4 insertions, 4 deletions
diff --git a/ansible/group_vars/all/apt-repos.yml b/ansible/group_vars/all/apt-repos.yml
index d0309ac..6979389 100644
--- a/ansible/group_vars/all/apt-repos.yml
+++ b/ansible/group_vars/all/apt-repos.yml
@@ -49,7 +49,8 @@ apt_repos:
url: "[arch=amd64] https://repo.skype.com/deb"
distro: unstable
sections: main
- key_id: 1F3045A5DF7587C3
+ key_id: D4040146BE3972509FD57FC71F3045A5DF7587C3
+ key_url: https://repo.skype.com/data/SKYPE-GPG-KEY
keyserver: hkp://keyserver.ubuntu.com:80
state: "{{ apt_repos_skype_stable_state | default('absent') }}"
@@ -57,7 +58,8 @@ apt_repos:
url: "[arch=amd64] https://repo.skype.com/deb"
distro: unstable
sections: main
- key_id: 1F3045A5DF7587C3
+ key_id: D4040146BE3972509FD57FC71F3045A5DF7587C3
+ key_url: https://repo.skype.com/data/SKYPE-GPG-KEY
keyserver: hkp://keyserver.ubuntu.com:80
state: "{{ apt_repos_skype_unstable_state | default('absent') }}"
diff --git a/ansible/group_vars/workstation/apt-repos.yml b/ansible/group_vars/workstation/apt-repos.yml
index 333101f..d686f05 100644
--- a/ansible/group_vars/workstation/apt-repos.yml
+++ b/ansible/group_vars/workstation/apt-repos.yml
@@ -1,11 +1,9 @@
apt_repos_atom_state: present
-apt_repos_atom_state: present
apt_repos_docker_state: present
apt_repos_dropbox_state: present
apt_repos_google_cloud_sdk_state: present
apt_repos_google_state: present
apt_repos_heroku_state: present
-apt_repos_heroku_state: present
apt_repos_nextcloud_state: absent # integrated into debian now
apt_repos_nodesource_state: absent
apt_repos_openmodelica_state: present