CYT-010 apt-repo-meta: use Debian's default repositories

cytopia · Dec 26, 2017 · 055db80 · 055db80
1 parent d56c3a5
commit 055db80
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 22 deletions.
diff --git a/group_vars/all.yml b/group_vars/all.yml
@@ -5,11 +5,11 @@
 ###
 apt_repo_repositories:
   - file: debian-main
-    repo: deb http://ftp.de.debian.org/debian/ stretch main
+    repo: deb http://deb.debian.org/debian stretch main
   - file: debian-updates
-    repo: deb http://ftp.de.debian.org/debian/ stretch-updates main
+    repo: deb http://deb.debian.org/debian stretch-updates main
   - file: debian-security
-    repo: deb http://security.debian.org/debian-security stretch/updates main
+    repo: deb http://security.debian.org stretch/updates main
 
 
 ###

diff --git a/host_vars/cytopia-stretch.yml b/host_vars/cytopia-stretch.yml
@@ -12,13 +12,13 @@ debian_dist: stretch
 ###
 apt_repo_repositories:
   - file: debian-main
-    repo: "deb http://ftp.de.debian.org/debian/ {{ debian_dist }} main contrib non-free"
+    repo: "deb http://deb.debian.org/debian {{ debian_dist }} main contrib non-free"
   - file: debian-updates
-    repo: "deb http://ftp.de.debian.org/debian/ {{ debian_dist }}-updates main contrib non-free"
+    repo: "deb http://deb.debian.org/debian {{ debian_dist }}-updates main contrib non-free"
   - file: debian-security
-    repo: "deb http://security.debian.org/debian-security {{ debian_dist }}/updates main contrib non-free"
+    repo: "deb http://security.debian.org {{ debian_dist }}/updates main contrib non-free"
   - file: debian-backports
-    repo: "deb http://ftp.debian.org/debian {{ debian_dist }}-backports main contrib non-free"
+    repo: "deb http://deb.debian.org/debian {{ debian_dist }}-backports main contrib non-free"
 
 
 ###

diff --git a/host_vars/cytopia-testing.yml b/host_vars/cytopia-testing.yml
@@ -12,11 +12,11 @@ debian_dist: buster
 ###
 apt_repo_repositories:
   - file: debian-main
-    repo: "deb http://ftp.de.debian.org/debian/ {{ debian_dist }} main contrib non-free"
+    repo: "deb http://deb.debian.org/debian {{ debian_dist }} main contrib non-free"
   - file: debian-updates
-    repo: "deb http://ftp.de.debian.org/debian/ {{ debian_dist }}-updates main contrib non-free"
+    repo: "deb http://deb.debian.org/debian {{ debian_dist }}-updates main contrib non-free"
   - file: debian-security
-    repo: "deb http://security.debian.org/debian-security {{ debian_dist }}/updates main contrib non-free"
+    repo: "deb http://security.debian.org {{ debian_dist }}/updates main contrib non-free"
 
 
 ###

diff --git a/host_vars/debian-stretch.yml b/host_vars/debian-stretch.yml
@@ -12,13 +12,11 @@ debian_dist: stretch
 ###
 apt_repo_repositories:
   - file: debian-main
-    repo: "deb http://ftp.de.debian.org/debian/ {{ debian_dist }} main"
+    repo: "deb http://deb.debian.org/debian {{ debian_dist }} main"
   - file: debian-updates
-    repo: "deb http://ftp.de.debian.org/debian/ {{ debian_dist }}-updates main"
+    repo: "deb http://deb.debian.org/debian {{ debian_dist }}-updates main"
   - file: debian-security
-    repo: "deb http://security.debian.org/debian-security {{ debian_dist }}/updates main"
-  - file: debian-backports
-    repo: "deb http://ftp.debian.org/debian {{ debian_dist }}-backports main"
+    repo: "deb http://security.debian.org {{ debian_dist }}/updates main"
 
 
 ###

diff --git a/host_vars/debian-testing.yml b/host_vars/debian-testing.yml
@@ -12,11 +12,11 @@ debian_dist: buster
 ###
 apt_repo_repositories:
   - file: debian-main
-    repo: "deb http://ftp.de.debian.org/debian/ {{ debian_dist }} main"
+    repo: "deb http://deb.debian.org/debian {{ debian_dist }} main"
   - file: debian-updates
-    repo: "deb http://ftp.de.debian.org/debian/ {{ debian_dist }}-updates main"
+    repo: "deb http://deb.debian.org/debian {{ debian_dist }}-updates main"
   - file: debian-security
-    repo: "deb http://security.debian.org/debian-security {{ debian_dist }}/updates main"
+    repo: "deb http://security.debian.org {{ debian_dist }}/updates main"
 
 
 ###

diff --git a/roles/apt-repo-meta/defaults/main.yml b/roles/apt-repo-meta/defaults/main.yml
@@ -3,10 +3,14 @@
 # State is present by default
 apt_repo_state: present
 
-# Array of repositories to add
-apt_repo_repositories: []
-# - file: filename
-#   repo: deb http://repo/ stretch main
+# Array of repositories to add by default
+apt_repo_repositories:
+  - file: debian-main
+    repo: deb http://deb.debian.org/debian stretch main
+  - file: debian-updates
+    repo: deb http://deb.debian.org/debian stretch-updates main
+  - file: debian-security
+    repo: deb http://security.debian.org stretch/updates main
 
 # Array of apt keys to add (all are optional)
 apt_repo_keys: []

diff --git a/roles/apt-repo-meta/tasks/main.yml b/roles/apt-repo-meta/tasks/main.yml
@@ -1,5 +1,12 @@
 ---
 
+- name: ensure default sources.list is removed
+  file:
+    state: absent
+    path: /etc/apt/sources.list
+  become: yes
+  notify: update apt repository cache
+
 - name: ensure apt keys are managed
   apt_key:
     state: "{{ apt_repo_state }}"