Adding mirror selection.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

9 files changed, 144 insertions, 7 deletions

diff --git a/debian/po/de.po b/debian/po/de.po
index a36ef6a..1495411 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: progress-linux 20181201-3\n"
 "Report-Msgid-Bugs-To: progress-linux@packages.debian.org\n"
-"POT-Creation-Date: 2019-02-08 22:04+0100\n"
+"POT-Creation-Date: 2019-11-18 17:31+0100\n"
 "PO-Revision-Date: 2019-02-02 07:55+0100\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -43,3 +43,23 @@ msgstr "Apt-Archivbereiche einrichten:"
 #: ../progress-linux.templates:3001
 msgid "Please select the apt archive areas to setup."
 msgstr "Bitte wählen Sie die einzurichtenden Apt-Archivbereiche aus."
+
+#. Type: string
+#. Description
+#: ../progress-linux.templates:4001
+msgid "enter apt mirror:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../progress-linux.templates:4001
+msgid "Please specify the mirror to download packages from."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../progress-linux.templates:4001
+msgid ""
+"If unsure, leave empty which will use the default mirror (https://cdn.deb."
+"progress-linux.org/packages)."
+msgstr ""
diff --git a/debian/po/fr.po b/debian/po/fr.po
index ed03959..0701b5d 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: progress-linux\n"
 "Report-Msgid-Bugs-To: progress-linux@packages.debian.org\n"
-"POT-Creation-Date: 2019-02-08 22:04+0100\n"
+"POT-Creation-Date: 2019-11-18 17:31+0100\n"
 "PO-Revision-Date: 2019-02-13 20:08+0100\n"
 "Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -44,3 +44,23 @@ msgstr "Configurer les sections de l'archive APT :"
 #: ../progress-linux.templates:3001
 msgid "Please select the apt archive areas to setup."
 msgstr "Veuillez choisir les sections de l'archive APT à configurer."
+
+#. Type: string
+#. Description
+#: ../progress-linux.templates:4001
+msgid "enter apt mirror:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../progress-linux.templates:4001
+msgid "Please specify the mirror to download packages from."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../progress-linux.templates:4001
+msgid ""
+"If unsure, leave empty which will use the default mirror (https://cdn.deb."
+"progress-linux.org/packages)."
+msgstr ""
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 564c499..37ab88f 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: progress-linux_20181201-3\n"
 "Report-Msgid-Bugs-To: progress-linux@packages.debian.org\n"
-"POT-Creation-Date: 2019-02-08 22:04+0100\n"
+"POT-Creation-Date: 2019-11-18 17:31+0100\n"
 "PO-Revision-Date: 2019-02-01 15:03+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -44,3 +44,23 @@ msgstr "apt-archiefgebieden instellen:"
 #: ../progress-linux.templates:3001
 msgid "Please select the apt archive areas to setup."
 msgstr "Selecteer de in te stellen apt-archiefgebieden."
+
+#. Type: string
+#. Description
+#: ../progress-linux.templates:4001
+msgid "enter apt mirror:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../progress-linux.templates:4001
+msgid "Please specify the mirror to download packages from."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../progress-linux.templates:4001
+msgid ""
+"If unsure, leave empty which will use the default mirror (https://cdn.deb."
+"progress-linux.org/packages)."
+msgstr ""
diff --git a/debian/po/pt.po b/debian/po/pt.po
index caf9cee..62d41d5 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: progress-linux 20181201-3\n"
 "Report-Msgid-Bugs-To: progress-linux@packages.debian.org\n"
-"POT-Creation-Date: 2019-02-08 22:04+0100\n"
+"POT-Creation-Date: 2019-11-18 17:31+0100\n"
 "PO-Revision-Date: 2019-02-03 10:00+0000\n"
 "Last-Translator: Américo Monteiro <a_monteiro@gmx.com>\n"
 "Language-Team: Portuguese <>\n"
@@ -44,3 +44,23 @@ msgstr "configurar áreas de arquivo do apt:"
 #: ../progress-linux.templates:3001
 msgid "Please select the apt archive areas to setup."
 msgstr "Por favor escolha as áreas do arquivo apt a configurar."
+
+#. Type: string
+#. Description
+#: ../progress-linux.templates:4001
+msgid "enter apt mirror:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../progress-linux.templates:4001
+msgid "Please specify the mirror to download packages from."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../progress-linux.templates:4001
+msgid ""
+"If unsure, leave empty which will use the default mirror (https://cdn.deb."
+"progress-linux.org/packages)."
+msgstr ""
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 1d6c23c..65d3fce 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: progress-linux\n"
 "Report-Msgid-Bugs-To: progress-linux@packages.debian.org\n"
-"POT-Creation-Date: 2019-02-08 22:04+0100\n"
+"POT-Creation-Date: 2019-11-18 17:31+0100\n"
 "PO-Revision-Date: 2019-02-02 19:33+0500\n"
 "Last-Translator: Lev Lamberov <dogsleg@debian.org>\n"
 "Language-Team: Debian L10N Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -45,3 +45,23 @@ msgstr "Настройка разделов архива apt:"
 #: ../progress-linux.templates:3001
 msgid "Please select the apt archive areas to setup."
 msgstr "Выберите разделы архива apt для настройки."
+
+#. Type: string
+#. Description
+#: ../progress-linux.templates:4001
+msgid "enter apt mirror:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../progress-linux.templates:4001
+msgid "Please specify the mirror to download packages from."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../progress-linux.templates:4001
+msgid ""
+"If unsure, leave empty which will use the default mirror (https://cdn.deb."
+"progress-linux.org/packages)."
+msgstr ""
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index b2fbba3..a303589 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: progress-linux\n"
 "Report-Msgid-Bugs-To: progress-linux@packages.debian.org\n"
-"POT-Creation-Date: 2019-02-08 22:04+0100\n"
+"POT-Creation-Date: 2019-11-18 17:31+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -46,3 +46,23 @@ msgstr ""
 #: ../progress-linux.templates:3001
 msgid "Please select the apt archive areas to setup."
 msgstr ""
+
+#. Type: string
+#. Description
+#: ../progress-linux.templates:4001
+msgid "enter apt mirror:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../progress-linux.templates:4001
+msgid "Please specify the mirror to download packages from."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../progress-linux.templates:4001
+msgid ""
+"If unsure, leave empty which will use the default mirror (https://cdn.deb."
+"progress-linux.org/packages)."
+msgstr ""
diff --git a/debian/progress-linux.config b/debian/progress-linux.config
index e95dd96..a3e55e3 100755
--- a/debian/progress-linux.config
+++ b/debian/progress-linux.config
@@ -25,6 +25,11 @@ Run_debconf ()
 		db_settitle ${PROJECT}/title
 		db_input high ${PROJECT}/archive-areas || true
 		db_go
+
+		# apt mirror
+		db_settitle ${PROJECT}/title
+		db_input high ${PROJECT}/mirror || true
+		db_go
 	fi
 }
 
diff --git a/debian/progress-linux.postinst b/debian/progress-linux.postinst
index 5bf957d..1943240 100755
--- a/debian/progress-linux.postinst
+++ b/debian/progress-linux.postinst
@@ -92,7 +92,7 @@ Configure_apt_sources_stanza ()
 cat >> "/etc/apt/sources.list.d/${PROJECT}.sources" << EOF
 
 Types: deb
-URIs: ${PACKAGES}
+URIs: ${MIRROR}
 Suites: ${SUITES}
 Components: ${COMPONENTS}
 PDiffs: no
@@ -187,6 +187,9 @@ case "${1}" in
 		db_get ${PROJECT}/archive-areas
 		ARCHIVE_AREAS="$(echo ${RET:-main} | sed -e 's|, | |g')" # string w/o empty
 
+		db_get ${PROJECT}/mirror
+		MIRROR="$(echo ${RET:-${PACKAGES}})" # string w/o empty
+
 		db_stop
 
 		BACKPORTS_PRIORITY="100"
diff --git a/debian/progress-linux.templates b/debian/progress-linux.templates
index 0972dc6..563c70f 100644
--- a/debian/progress-linux.templates
+++ b/debian/progress-linux.templates
@@ -16,3 +16,12 @@ Choices: ${CHOICES}
 Default: 
 _Description: setup apt archive areas:
  Please select the apt archive areas to setup.
+
+Template: progress-linux/mirror
+Type: string
+Default: https://cdn.deb.progress-linux.org/packages
+_Description: enter apt mirror:
+ Please specify the mirror to download packages from.
+ .
+ If unsure, leave empty which will use the default mirror
+ (https://cdn.deb.progress-linux.org/packages).