From afb6f902f1f58bc6ed7731a16c78d2f440dea0f0 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Thu, 12 Oct 2017 20:25:35 -0400 Subject: [PATCH] Use sources.list.d for Debian with APT Under debian, /etc/apt/sources.list.d is where the default list files are stored. We need to also use that to properly re-write them. Otherwise, we don't properly configure our AFS mirrors. Change-Id: I1eb3ac19ba7081d3f4fd9b000e266d86449dee0e Signed-off-by: Paul Belanger --- roles/configure-mirrors/tasks/mirror/Debian.yaml | 8 ++++---- .../etc/apt/{ => sources.list.d}/backports.list.j2 | 0 .../etc/apt/{ => sources.list.d}/default.list.j2 | 0 .../etc/apt/{ => sources.list.d}/security.list.j2 | 0 .../etc/apt/{ => sources.list.d}/updates.list.j2 | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename roles/configure-mirrors/templates/etc/apt/{ => sources.list.d}/backports.list.j2 (100%) rename roles/configure-mirrors/templates/etc/apt/{ => sources.list.d}/default.list.j2 (100%) rename roles/configure-mirrors/templates/etc/apt/{ => sources.list.d}/security.list.j2 (100%) rename roles/configure-mirrors/templates/etc/apt/{ => sources.list.d}/updates.list.j2 (100%) diff --git a/roles/configure-mirrors/tasks/mirror/Debian.yaml b/roles/configure-mirrors/tasks/mirror/Debian.yaml index d4cd438c0..7d72205a4 100644 --- a/roles/configure-mirrors/tasks/mirror/Debian.yaml +++ b/roles/configure-mirrors/tasks/mirror/Debian.yaml @@ -7,10 +7,10 @@ owner: root src: "{{ item }}.j2" with_items: - - etc/apt/default.list - - etc/apt/updates.list - - etc/apt/backports.list - - etc/apt/security.list + - etc/apt/sources.list.d/default.list + - etc/apt/sources.list.d/updates.list + - etc/apt/sources.list.d/backports.list + - etc/apt/sources.list.d/security.list - etc/apt/apt.conf.d/99unauthenticated notify: - Update apt cache diff --git a/roles/configure-mirrors/templates/etc/apt/backports.list.j2 b/roles/configure-mirrors/templates/etc/apt/sources.list.d/backports.list.j2 similarity index 100% rename from roles/configure-mirrors/templates/etc/apt/backports.list.j2 rename to roles/configure-mirrors/templates/etc/apt/sources.list.d/backports.list.j2 diff --git a/roles/configure-mirrors/templates/etc/apt/default.list.j2 b/roles/configure-mirrors/templates/etc/apt/sources.list.d/default.list.j2 similarity index 100% rename from roles/configure-mirrors/templates/etc/apt/default.list.j2 rename to roles/configure-mirrors/templates/etc/apt/sources.list.d/default.list.j2 diff --git a/roles/configure-mirrors/templates/etc/apt/security.list.j2 b/roles/configure-mirrors/templates/etc/apt/sources.list.d/security.list.j2 similarity index 100% rename from roles/configure-mirrors/templates/etc/apt/security.list.j2 rename to roles/configure-mirrors/templates/etc/apt/sources.list.d/security.list.j2 diff --git a/roles/configure-mirrors/templates/etc/apt/updates.list.j2 b/roles/configure-mirrors/templates/etc/apt/sources.list.d/updates.list.j2 similarity index 100% rename from roles/configure-mirrors/templates/etc/apt/updates.list.j2 rename to roles/configure-mirrors/templates/etc/apt/sources.list.d/updates.list.j2