From 975220d1749fa479d30e3f8566f68439e9152cbe Mon Sep 17 00:00:00 2001
From: Alexandre Iooss <erdnaxe@crans.org>
Date: Mon, 30 Mar 2020 23:14:04 +0200
Subject: [PATCH] Use syncproxy for mirror sources

---
 roles/ftpsync/templates/ftpsync.conf.j2 | 10 ++++-----
 services_web.yml                        | 28 ++++++++++---------------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/roles/ftpsync/templates/ftpsync.conf.j2 b/roles/ftpsync/templates/ftpsync.conf.j2
index 42dd0ed5..a4178b35 100644
--- a/roles/ftpsync/templates/ftpsync.conf.j2
+++ b/roles/ftpsync/templates/ftpsync.conf.j2
@@ -1,6 +1,6 @@
 # {{ ansible_managed }}
 
-# MIRRORNAME=`hostname -f`
+MIRRORNAME="CRANS"
 TO="{{ item.dest }}"
 MAILTO="root"
 # HUB=false
@@ -18,11 +18,11 @@ RSYNC_PATH="{{ item.rsync_path }}"
 ## Mirror information options
 ########################################################################
 
-# INFO_MAINTAINER="Admins <admins@example.com>, Person <person@example.com>"
+INFO_MAINTAINER="Les Nounous <contact@crans.org>"
 # INFO_SPONSOR="Example <https://example.com>"
-# INFO_COUNTRY=DE
-# INFO_LOCATION="Example"
-# INFO_THROUGHPUT=10Gb
+INFO_COUNTRY=FR
+INFO_LOCATION="Cachan, Île-de-France"
+INFO_THROUGHPUT=1Gb
 
 ########################################################################
 ## Include and exclude options
diff --git a/services_web.yml b/services_web.yml
index 7c17c156..29c9f874 100644
--- a/services_web.yml
+++ b/services_web.yml
@@ -39,38 +39,32 @@
       - name: main
         dest: /pubftp/pub/debian/
         cron_time: "25 1,13"
-        rsync_host: ftp.fr.debian.org
+        rsync_host: syncproxy3.eu.debian.org
         rsync_path: debian
 
       - name: security
         dest: /pubftp/pub/debian-security/
         cron_time: "40    *"
-        rsync_host: ftp.fr.debian.org
+        rsync_host: syncproxy3.eu.debian.org
         rsync_path: debian-security
 
-      - name: backports
-        dest: /pubftp/pub/debian-backports/
-        cron_time: " 7 3,15"
-        rsync_host: ftp.fr.debian.org
-        rsync_path: debian-backports
-
       - name: ports
         dest: /pubftp/pub/debian-ports/
         cron_time: " 7 3,15"
-        rsync_host: deb.debian.org
+        rsync_host: syncproxy3.eu.debian.org
         rsync_path: debian-ports
 
-      - name: multimedia
-        dest: /pubftp/pub/debian-multimedia/
-        cron_time: "49 4,16"
-        rsync_host: www.deb-multimedia.org
-        rsync_path: deb
+      - name: backports
+        dest: /pubftp/pub/debian-backports/
+        cron_time: " 7 3,15"
+        rsync_host: syncproxy3.eu.debian.org
+        rsync_path: debian-backports
 
       - name: ubuntu
         dest: /pubftp/pub/ubuntu/
         cron_time: "55 5,17"
-        rsync_host: ftp.lip6.fr
-        rsync_path: Ubuntu/archive/
+        rsync_host: wahoo.canonical.com
+        rsync_path: ubuntu
 
     rsync_mirror:
       - name: videolan
@@ -83,7 +77,7 @@
         dest: /pubftp/pub/distributions/linux/ubuntu
         cron_time: "00 5"
         rsync_host: cdimage.ubuntu.com
-        rsync_path: cdimage/ubuntu/releases
+        rsync_path: cdimage/releases
 
       - name: xubuntu
         dest: /pubftp/pub/distributions/linux/xubuntu