From bb92cf6820d6e6cfa6d43a255e2486774d0efd9b Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <ynerant@crans.org>
Date: Sat, 6 Nov 2021 22:01:12 +0100
Subject: [PATCH] [ftpsync] Add Ubuntu mirror configuration
Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
---
group_vars/mirror_backend.yml | 9 +++++++--
roles/apt-mirror/templates/apt/mirror.list.j2 | 1 +
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/group_vars/mirror_backend.yml b/group_vars/mirror_backend.yml
index 340828c9..98239336 100644
--- a/group_vars/mirror_backend.yml
+++ b/group_vars/mirror_backend.yml
@@ -19,9 +19,14 @@ glob_ftpsync:
rsync_path: debian-security
- name: backports
dest: debian-backports
- cron_time: " 7 3,15"
+ cron_time: "07 3,15"
rsync_host: ftp.fr.debian.org
rsync_path: debian-backports
+ - name: ubuntu
+ dest: ubuntu
+ cron_time: "43 5,17"
+ rsync_host: fr.archive.ubuntu.com
+ rsync_path: ubuntu
glob_rsync_mirror:
root: /mirror/pub
@@ -70,7 +75,7 @@ glob_rsync_mirror:
rsync_path: cdimage/ubuntu-mate/releases
- name: archlinux
dest: archlinux
- cron_time: "08 3"
+ cron_time: "08 3,15"
rsync_host: archlinux.polymorf.fr
rsync_path: archlinux/
diff --git a/roles/apt-mirror/templates/apt/mirror.list.j2 b/roles/apt-mirror/templates/apt/mirror.list.j2
index 58b7a46b..796d91b0 100644
--- a/roles/apt-mirror/templates/apt/mirror.list.j2
+++ b/roles/apt-mirror/templates/apt/mirror.list.j2
@@ -19,6 +19,7 @@ set _tilde 0
{% for target in apt_mirror.targets %}
{% for suite in target.suite %}
deb {{ target.scheme }}://{{ target.host }}/{{ target.path }} {{ suite }}{% for component in target.components %} {{ component }}{% endfor %}
+
{% endfor %}
clean {{ target.scheme }}://{{ target.host }}/{{ target.path }}
--
GitLab