From f0803cb1b11ac5f4c8bd30d0dea8ceccb7a72602 Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Wed, 18 Aug 2021 19:25:20 +0200
Subject: apt-repos

---
 ansible/group_vars/all/apt-repos.yml         | 16 ++++++++++++----
 ansible/group_vars/workstation/apt-repos.yml |  5 +++--
 2 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'ansible/group_vars')

diff --git a/ansible/group_vars/all/apt-repos.yml b/ansible/group_vars/all/apt-repos.yml
index 0550745..6ec3b6a 100644
--- a/ansible/group_vars/all/apt-repos.yml
+++ b/ansible/group_vars/all/apt-repos.yml
@@ -15,7 +15,7 @@ apt_repos:
 
   openmodelica:
     url: http://build.openmodelica.org/apt
-    distro: jessie
+    distro: "{{ ansible_distribution_release }}"
     sections: release
     key_id: D229AF1CE5AED74E5F59DF303A59B53664970947
     key_url: http://build.openmodelica.org/apt/openmodelica.asc
@@ -31,7 +31,7 @@ apt_repos:
 
   docker:
     url: "[arch=amd64] https://download.docker.com/linux/debian"
-    distro: stretch
+    distro: "{{ ansible_distribution_release }}"
     sections: stable
     key_id: 9DC858229FC7DD38854AE2D88D81803C0EBFCD88
     key_url: https://download.docker.com/linux/debian/gpg
@@ -49,7 +49,7 @@ apt_repos:
     url: "[arch=amd64] https://repo.skype.com/deb"
     distro: stable
     sections: main
-    key_id: D4040146BE3972509FD57FC71F3045A5DF7587C3
+    key_id: 1F3045A5DF7587C3
     key_url: https://repo.skype.com/data/SKYPE-GPG-KEY
     keyserver: hkp://keyserver.ubuntu.com:80
     state: "{{ apt_repos_skype_stable_state | default('absent') }}"
@@ -121,7 +121,7 @@ apt_repos:
 
   slack:
     url: https://packagecloud.io/slacktechnologies/slack/debian/
-    distro: jessie
+    distro: jessie # "{{ ansible_distribution_release }}"
     sections: main
     key_id: C6ABDCF64DB9A0B2
     keyserver: hkp://keyserver.ubuntu.com:80
@@ -143,3 +143,11 @@ apt_repos:
     key_id: EB4C1BFD4F042F6DDDCCEC917721F63BD38B4796
     key_url: https://dl.google.com/linux/linux_signing_key.pub
     state: "{{ apt_repos_dart_state | default('absent') }}"
+
+  balena_etcher:
+    url: "https://dl.cloudsmith.io/public/balena/etcher/deb/debian"
+    distro: "{{ ansible_distribution_release }}"
+    sections: main
+    key_id: 70528471AFF9A051
+    key_url: https://dl.cloudsmith.io/public/balena/etcher/gpg.70528471AFF9A051.key
+    state: "{{ apt_repos_balena_etcher_state | default('absent') }}"
diff --git a/ansible/group_vars/workstation/apt-repos.yml b/ansible/group_vars/workstation/apt-repos.yml
index a4d3d34..d9ddc5f 100644
--- a/ansible/group_vars/workstation/apt-repos.yml
+++ b/ansible/group_vars/workstation/apt-repos.yml
@@ -1,6 +1,7 @@
 apt_repos_atom_state: present
+apt_repos_balena_etcher_state: present
 apt_repos_dart_state: present
-apt_repos_docker_state: present
+apt_repos_docker_state: absent # debian's version is up to date now
 apt_repos_dropbox_state: present
 apt_repos_google_cloud_sdk_state: present
 apt_repos_google_state: present
@@ -11,7 +12,7 @@ apt_repos_openmodelica_state: present
 apt_repos_picoscope_state: present
 apt_repos_postgresql_state: present
 apt_repos_signal_state: present
-apt_repos_skype_stable_state: present
+apt_repos_skype_stable_state: absent
 apt_repos_skype_unstable_state: absent
 apt_repos_slack_state: present
 apt_repos_souffle_state: absent
-- 
cgit v1.2.3