aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTrygve Laugstøl <trygvis@inamo.no>2019-09-25 15:09:45 +0200
committerTrygve Laugstøl <trygvis@inamo.no>2019-09-25 15:11:19 +0200
commit21033c75440906c3a8e36c1266e114a8c4177e08 (patch)
tree5283672158e343bcbd08bd5e4b5c24a660c78e01
parentfa2f9d465c26226fcb3e50e3508e04b3af7cede8 (diff)
downloadinfra-21033c75440906c3a8e36c1266e114a8c4177e08.tar.gz
infra-21033c75440906c3a8e36c1266e114a8c4177e08.tar.bz2
infra-21033c75440906c3a8e36c1266e114a8c4177e08.tar.xz
infra-21033c75440906c3a8e36c1266e114a8c4177e08.zip
apt-repos:
o Adding definition for skype-stable. o Defaulting to skype-stable, not unstable.
-rw-r--r--ansible/group_vars/all/apt-repos.yml8
-rw-r--r--ansible/group_vars/workstation/apt-repos.yml27
2 files changed, 19 insertions, 16 deletions
diff --git a/ansible/group_vars/all/apt-repos.yml b/ansible/group_vars/all/apt-repos.yml
index fad2478..d0309ac 100644
--- a/ansible/group_vars/all/apt-repos.yml
+++ b/ansible/group_vars/all/apt-repos.yml
@@ -45,10 +45,12 @@ apt_repos:
key_url: http://labs.picotech.com/debian/dists/picoscope/Release.gpg.key
state: "{{ apt_repos_picoscope_state | default('absent') }}"
- skype:
- state: "{{ apt_repos_skype_state | default('absent') }}"
-
skype-stable:
+ url: "[arch=amd64] https://repo.skype.com/deb"
+ distro: unstable
+ sections: main
+ key_id: 1F3045A5DF7587C3
+ keyserver: hkp://keyserver.ubuntu.com:80
state: "{{ apt_repos_skype_stable_state | default('absent') }}"
skype-unstable:
diff --git a/ansible/group_vars/workstation/apt-repos.yml b/ansible/group_vars/workstation/apt-repos.yml
index b1229b4..333101f 100644
--- a/ansible/group_vars/workstation/apt-repos.yml
+++ b/ansible/group_vars/workstation/apt-repos.yml
@@ -1,18 +1,19 @@
-apt_repos_google_state: present
+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
-apt_repos_dropbox_state: present
-apt_repos_docker_state: present
apt_repos_picoscope_state: present
-apt_repos_skype_state: present
-apt_repos_skype_stable_state: present
-apt_repos_skype_unstable_state: present
+apt_repos_postgresql_state: present
apt_repos_signal_state: present
-apt_repos_spotify_state: present
-apt_repos_nodesource_state: present
-apt_repos_nextcloud_state: absent # integrated into debian now
-apt_repos_heroku_state: present
-apt_repos_atom_state: present
-apt_repos_souffle_state: present
+apt_repos_skype_stable_state: present
+apt_repos_skype_unstable_state: absent
apt_repos_slack_state: present
-apt_repos_postgresql_state: present
+apt_repos_souffle_state: present
+apt_repos_spotify_state: present