Browse Source

Fix sources.list for all distribution to take account debian_mirror variable

Emmanuel Bouthenot 4 years ago
parent
commit
f7f87f0f0f

+ 1 - 1
roles/common/defaults/main.yml

@@ -19,7 +19,7 @@ hosts_static_lookup: []
 
 ipv6_disabled: False
 
-debian_mirror: 'http://httpredir.debian.org/debian'
+debian_mirror: 'http://deb.debian.org'
 
 apt_keys: []
 apt_repositories: []

+ 8 - 8
roles/common/templates/apt/sources.buster.list.j2

@@ -2,17 +2,17 @@
 {% from 'templates/ansible/prolog.j2' import prolog with context %}
 {{ prolog() }}
 {% endif -%}
-deb http://deb.debian.org/debian buster main contrib non-free
-#deb-src http://deb.debian.org/debian buster main contrib non-free
+deb {{ debian_mirror }}/debian buster main contrib non-free
+#deb-src {{ debian_mirror }}/debian buster main contrib non-free
 
 deb http://deb.debian.org/debian-security buster/updates main contrib non-free
 #deb-src http://deb.debian.org/debian-security buster/updates main contrib non-free
 
-deb http://deb.debian.org/debian buster-updates main contrib non-free
-#deb-src http://deb.debian.org/debian buster-updates main contrib non-free
+deb {{ debian_mirror }}/debian buster-updates main contrib non-free
+#deb-src {{ debian_mirror }}/debian buster-updates main contrib non-free
 
-#deb http://deb.debian.org/debian buster-backports main contrib non-free
-#deb-src http://deb.debian.org/debian buster-backports main contrib non-free
+#deb {{ debian_mirror }}/debian buster-backports main contrib non-free
+#deb-src {{ debian_mirror }}/debian/ buster-backports main contrib non-free
 
-#deb http://deb.debian.org/debian buster-backports-sloppy main contrib non-free
-#deb-src http://deb.debian.org/debian buster-backports-sloppy main contrib non-free
+#deb {{ debian_mirror }}/debian buster-backports-sloppy main contrib non-free
+#deb-src {{ debian_mirror }}/debian/ buster-backports-sloppy main contrib non-free

+ 8 - 8
roles/common/templates/apt/sources.jessie.list.j2

@@ -2,17 +2,17 @@
 {% from 'templates/ansible/prolog.j2' import prolog with context %}
 {{ prolog() }}
 {% endif -%}
-deb http://deb.debian.org/debian jessie main contrib non-free
-#deb-src http://deb.debian.org/debian jessie main contrib non-free
+deb {{ debian_mirror }}/debian jessie main contrib non-free
+#deb-src {{ debian_mirror }}/debian jessie main contrib non-free
 
 deb http://deb.debian.org/debian-security jessie/updates main contrib non-free
 #deb-src http://deb.debian.org/debian-security jessie/updates main contrib non-free
 
-deb http://deb.debian.org/debian jessie-updates main contrib non-free
-#deb-src http://deb.debian.org/debian jessie-updates main contrib non-free
+deb {{ debian_mirror }}/debian jessie-updates main contrib non-free
+#deb-src {{ debian_mirror }}/debian jessie-updates main contrib non-free
 
-#deb http://deb.debian.org/debian jessie-backports main contrib non-free
-#deb-src http://deb.debian.org/debian jessie-backports main contrib non-free
+#deb {{ debian_mirror }}/debian jessie-backports main contrib non-free
+#deb-src {{ debian_mirror }}/debian jessie-backports main contrib non-free
 
-#deb http://deb.debian.org/debian jessie-backports-sloppy main contrib non-free
-#deb-src http://deb.debian.org/debian jessie-backports-sloppy main contrib non-free
+#deb {{ debian_mirror }}/debian jessie-backports-sloppy main contrib non-free
+#deb-src {{ debian_mirror }}/debian jessie-backports-sloppy main contrib non-free

+ 4 - 4
roles/common/templates/apt/sources.sid.list.j2

@@ -2,8 +2,8 @@
 {% from 'templates/ansible/prolog.j2' import prolog with context %}
 {{ prolog() }}
 {% endif -%}
-deb {{ debian_mirror }} sid main contrib non-free
-deb-src {{ debian_mirror }} sid main contrib non-free
+deb {{ debian_mirror }}/debian sid main contrib non-free
+deb-src {{ debian_mirror }}/debian sid main contrib non-free
 
-deb {{ debian_mirror }} experimental main contrib non-free
-deb-src {{ debian_mirror }} experimental main contrib non-free
+deb {{ debian_mirror }}/debian experimental main contrib non-free
+deb-src {{ debian_mirror }}/debian experimental main contrib non-free

+ 10 - 13
roles/common/templates/apt/sources.squeeze.list.j2

@@ -2,20 +2,17 @@
 {% from 'templates/ansible/prolog.j2' import prolog with context %}
 {{ prolog() }}
 {% endif -%}
-deb {{ debian_mirror }} squeeze main contrib non-free
-#deb-src {{ debian_mirror }} squeeze main contrib non-free
+deb http://archive.debian.org/debian squeeze main contrib non-free
+#deb-src http://archive.debian.org/debian squeeze main contrib non-free
 
-deb {{ debian_mirror }} squeeze-updates main contrib non-free
-#deb-src {{ debian_mirror }} squeeze-updates main contrib non-free
+deb http://archive.debian.org/debian squeeze-proposed-updates main contrib non-free
+#deb-src http://archive.debian.org/debian squeeze-proposed-updates main contrib non-free
 
-deb {{ debian_mirror }} squeeze-lts main contrib non-free
-#deb-src {{ debian_mirror }} squeeze-lts main contrib non-free
+deb http://archive.debian.org/debian squeeze-lts main contrib non-free
+#deb-src http://archive.debian.org/debian squeeze-lts main contrib non-free
 
-deb http://security.debian.org/ squeeze/updates main contrib non-free
-#deb-src http://security.debian.org/ squeeze/updates main contrib non-free
+#deb http://archive.debian.org/debian-backports squeeze-backports main contrib non-free
+#deb-src http://archive.debian.org/debian-backports squeeze-backports main contrib non-free
 
-deb http://backports.debian.org/debian-backports squeeze-backports main contrib non-free
-#deb-src http://backports.debian.org/debian-backports squeeze-backports main contrib non-free
-
-deb http://backports.debian.org/debian-backports squeeze-backports-sloppy main contrib non-free
-#deb-src http://backports.debian.org/debian-backports squeeze-backports-sloppy main contrib non-free
+#deb http://archive.debian.org/debian-backports squeeze-backports-sloppy main contrib non-free
+#deb-src http://archive.debian.org/debian-backports squeeze-backports-sloppy main contrib non-free

+ 8 - 8
roles/common/templates/apt/sources.stretch.list.j2

@@ -2,17 +2,17 @@
 {% from 'templates/ansible/prolog.j2' import prolog with context %}
 {{ prolog() }}
 {% endif -%}
-deb http://deb.debian.org/debian stretch main contrib non-free
-#deb-src http://deb.debian.org/debian stretch main contrib non-free
+deb {{ debian_mirror }}/debian stretch main contrib non-free
+#deb-src {{ debian_mirror }}/debian stretch main contrib non-free
 
 deb http://deb.debian.org/debian-security stretch/updates main contrib non-free
 #deb-src http://deb.debian.org/debian-security stretch/updates main contrib non-free
 
-deb http://deb.debian.org/debian stretch-updates main contrib non-free
-#deb-src http://deb.debian.org/debian stretch-updates main contrib non-free
+deb {{ debian_mirror }}/debian/ stretch-updates main contrib non-free
+#deb-src {{ debian_mirror }}/debian/ stretch-updates main contrib non-free
 
-deb http://deb.debian.org/debian stretch-backports main contrib non-free
-#deb-src http://deb.debian.org/debian stretch-backports main contrib non-free
+#deb {{ debian_mirror }}/debian/ stretch-backports main contrib non-free
+#deb-src {{ debian_mirror }}/debian/ stretch-backports main contrib non-free
 
-#deb http://deb.debian.org/debian stretch-backports-sloppy main contrib non-free
-#deb-src http://deb.debian.org/debian stretch-backports-sloppy main contrib non-free
+#deb {{ debian_mirror }}/debian/ stretch-backports-sloppy main contrib non-free
+#deb-src {{ debian_mirror }}/debian/ stretch-backports-sloppy main contrib non-free

+ 6 - 9
roles/common/templates/apt/sources.wheezy.list.j2

@@ -2,14 +2,11 @@
 {% from 'templates/ansible/prolog.j2' import prolog with context %}
 {{ prolog() }}
 {% endif -%}
-deb {{ debian_mirror }} wheezy main contrib non-free
-#deb-src {{ debian_mirror }} wheezy main contrib non-free
+deb http://archive.debian.org/debian wheezy main contrib non-free
+#deb-src http://archive.debian.org/debian wheezy main contrib non-free
 
-deb {{ debian_mirror }} wheezy-updates main contrib non-free
-#deb-src {{ debian_mirror }} wheezy-updates main contrib non-free
+#deb http://archive.debian.org/debian wheezy-backports main contrib non-free
+#deb-src http://archive.debian.org/debian wheezy-backports main contrib non-free
 
-deb http://security.debian.org/ wheezy/updates main contrib non-free
-#deb-src http://security.debian.org/ wheezy/updates main contrib non-free
-
-deb {{ debian_mirror }} wheezy-backports main contrib non-free
-#deb-src {{ debian_mirror }} wheezy-backports main contrib non-free
+#deb http://archive.debian.org/debian wheezy-backports-sloppy main contrib non-free
+#deb-src http://archive.debian.org/debian wheezy-backports-sloppy main contrib non-free