From 0bf5691258bbbf9737928a553ce9bd3f3495c74b Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 12 Nov 2019 06:30:36 +0100 Subject: Adding preseedable mirrors. Signed-off-by: Daniel Baumann --- debian/po/de.po | 63 ++++++++++++++++++++++++++++++++++++++++- debian/po/fr.po | 63 ++++++++++++++++++++++++++++++++++++++++- debian/po/nl.po | 63 ++++++++++++++++++++++++++++++++++++++++- debian/po/pt.po | 63 ++++++++++++++++++++++++++++++++++++++++- debian/po/ru.po | 63 ++++++++++++++++++++++++++++++++++++++++- debian/po/templates.pot | 61 ++++++++++++++++++++++++++++++++++++++- debian/progress-linux.config | 10 +++++++ debian/progress-linux.postinst | 12 ++++++-- debian/progress-linux.templates | 21 ++++++++++++++ 9 files changed, 411 insertions(+), 8 deletions(-) diff --git a/debian/po/de.po b/debian/po/de.po index a36ef6a..777dc01 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-12 06:35+0100\n" "PO-Revision-Date: 2019-02-02 07:55+0100\n" "Last-Translator: Helge Kreutzmann \n" "Language-Team: German \n" @@ -43,3 +43,64 @@ 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 +#. Default +#: ../progress-linux.templates:4001 +msgid "https://cdn.deb.progress-linux.org/packages" +msgstr "" + +#. Type: string +#. Description +#: ../progress-linux.templates:4002 +#, fuzzy +#| msgid "Progress Linux: Setup" +msgid "default Progress Linux mirror" +msgstr "Progress Linux: Einrichtung" + +#. Type: string +#. Description +#: ../progress-linux.templates:4002 +msgid "" +"Please enter the Progress Linux mirror (defaults to https://cdn.deb.progress-" +"linux.org/packages)." +msgstr "" + +#. Type: string +#. Default +#: ../progress-linux.templates:5001 +msgid "https://deb.debian.org/debian" +msgstr "" + +#. Type: string +#. Description +#: ../progress-linux.templates:5002 +msgid "default Debian mirror" +msgstr "" + +#. Type: string +#. Description +#: ../progress-linux.templates:5002 +msgid "" +"Please enter the Debian mirror (defaults to https://deb.debian.org/debian)." +msgstr "" + +#. Type: string +#. Default +#: ../progress-linux.templates:6001 +msgid "http://security.debian.org" +msgstr "" + +#. Type: string +#. Description +#: ../progress-linux.templates:6002 +msgid "default Debian security mirror" +msgstr "" + +#. Type: string +#. Description +#: ../progress-linux.templates:6002 +msgid "" +"Please enter the Debian security mirror (defaults to http://security.debian." +"org)." +msgstr "" diff --git a/debian/po/fr.po b/debian/po/fr.po index ed03959..37c92d1 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-12 06:35+0100\n" "PO-Revision-Date: 2019-02-13 20:08+0100\n" "Last-Translator: Jean-Pierre Giraud \n" "Language-Team: French \n" @@ -44,3 +44,64 @@ 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 +#. Default +#: ../progress-linux.templates:4001 +msgid "https://cdn.deb.progress-linux.org/packages" +msgstr "" + +#. Type: string +#. Description +#: ../progress-linux.templates:4002 +#, fuzzy +#| msgid "Progress Linux: Setup" +msgid "default Progress Linux mirror" +msgstr "Progress Linux : configuration" + +#. Type: string +#. Description +#: ../progress-linux.templates:4002 +msgid "" +"Please enter the Progress Linux mirror (defaults to https://cdn.deb.progress-" +"linux.org/packages)." +msgstr "" + +#. Type: string +#. Default +#: ../progress-linux.templates:5001 +msgid "https://deb.debian.org/debian" +msgstr "" + +#. Type: string +#. Description +#: ../progress-linux.templates:5002 +msgid "default Debian mirror" +msgstr "" + +#. Type: string +#. Description +#: ../progress-linux.templates:5002 +msgid "" +"Please enter the Debian mirror (defaults to https://deb.debian.org/debian)." +msgstr "" + +#. Type: string +#. Default +#: ../progress-linux.templates:6001 +msgid "http://security.debian.org" +msgstr "" + +#. Type: string +#. Description +#: ../progress-linux.templates:6002 +msgid "default Debian security mirror" +msgstr "" + +#. Type: string +#. Description +#: ../progress-linux.templates:6002 +msgid "" +"Please enter the Debian security mirror (defaults to http://security.debian." +"org)." +msgstr "" diff --git a/debian/po/nl.po b/debian/po/nl.po index 564c499..d518a46 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-12 06:35+0100\n" "PO-Revision-Date: 2019-02-01 15:03+0100\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Debian Dutch l10n Team \n" @@ -44,3 +44,64 @@ 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 +#. Default +#: ../progress-linux.templates:4001 +msgid "https://cdn.deb.progress-linux.org/packages" +msgstr "" + +#. Type: string +#. Description +#: ../progress-linux.templates:4002 +#, fuzzy +#| msgid "Progress Linux: Setup" +msgid "default Progress Linux mirror" +msgstr "Progress Linux: Instellen" + +#. Type: string +#. Description +#: ../progress-linux.templates:4002 +msgid "" +"Please enter the Progress Linux mirror (defaults to https://cdn.deb.progress-" +"linux.org/packages)." +msgstr "" + +#. Type: string +#. Default +#: ../progress-linux.templates:5001 +msgid "https://deb.debian.org/debian" +msgstr "" + +#. Type: string +#. Description +#: ../progress-linux.templates:5002 +msgid "default Debian mirror" +msgstr "" + +#. Type: string +#. Description +#: ../progress-linux.templates:5002 +msgid "" +"Please enter the Debian mirror (defaults to https://deb.debian.org/debian)." +msgstr "" + +#. Type: string +#. Default +#: ../progress-linux.templates:6001 +msgid "http://security.debian.org" +msgstr "" + +#. Type: string +#. Description +#: ../progress-linux.templates:6002 +msgid "default Debian security mirror" +msgstr "" + +#. Type: string +#. Description +#: ../progress-linux.templates:6002 +msgid "" +"Please enter the Debian security mirror (defaults to http://security.debian." +"org)." +msgstr "" diff --git a/debian/po/pt.po b/debian/po/pt.po index caf9cee..215ad00 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-12 06:35+0100\n" "PO-Revision-Date: 2019-02-03 10:00+0000\n" "Last-Translator: Américo Monteiro \n" "Language-Team: Portuguese <>\n" @@ -44,3 +44,64 @@ 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 +#. Default +#: ../progress-linux.templates:4001 +msgid "https://cdn.deb.progress-linux.org/packages" +msgstr "" + +#. Type: string +#. Description +#: ../progress-linux.templates:4002 +#, fuzzy +#| msgid "Progress Linux: Setup" +msgid "default Progress Linux mirror" +msgstr "Progress Linux: Configuração" + +#. Type: string +#. Description +#: ../progress-linux.templates:4002 +msgid "" +"Please enter the Progress Linux mirror (defaults to https://cdn.deb.progress-" +"linux.org/packages)." +msgstr "" + +#. Type: string +#. Default +#: ../progress-linux.templates:5001 +msgid "https://deb.debian.org/debian" +msgstr "" + +#. Type: string +#. Description +#: ../progress-linux.templates:5002 +msgid "default Debian mirror" +msgstr "" + +#. Type: string +#. Description +#: ../progress-linux.templates:5002 +msgid "" +"Please enter the Debian mirror (defaults to https://deb.debian.org/debian)." +msgstr "" + +#. Type: string +#. Default +#: ../progress-linux.templates:6001 +msgid "http://security.debian.org" +msgstr "" + +#. Type: string +#. Description +#: ../progress-linux.templates:6002 +msgid "default Debian security mirror" +msgstr "" + +#. Type: string +#. Description +#: ../progress-linux.templates:6002 +msgid "" +"Please enter the Debian security mirror (defaults to http://security.debian." +"org)." +msgstr "" diff --git a/debian/po/ru.po b/debian/po/ru.po index 1d6c23c..a11c0ff 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-12 06:35+0100\n" "PO-Revision-Date: 2019-02-02 19:33+0500\n" "Last-Translator: Lev Lamberov \n" "Language-Team: Debian L10N Russian \n" @@ -45,3 +45,64 @@ msgstr "Настройка разделов архива apt:" #: ../progress-linux.templates:3001 msgid "Please select the apt archive areas to setup." msgstr "Выберите разделы архива apt для настройки." + +#. Type: string +#. Default +#: ../progress-linux.templates:4001 +msgid "https://cdn.deb.progress-linux.org/packages" +msgstr "" + +#. Type: string +#. Description +#: ../progress-linux.templates:4002 +#, fuzzy +#| msgid "Progress Linux: Setup" +msgid "default Progress Linux mirror" +msgstr "Progress Linux: настройка" + +#. Type: string +#. Description +#: ../progress-linux.templates:4002 +msgid "" +"Please enter the Progress Linux mirror (defaults to https://cdn.deb.progress-" +"linux.org/packages)." +msgstr "" + +#. Type: string +#. Default +#: ../progress-linux.templates:5001 +msgid "https://deb.debian.org/debian" +msgstr "" + +#. Type: string +#. Description +#: ../progress-linux.templates:5002 +msgid "default Debian mirror" +msgstr "" + +#. Type: string +#. Description +#: ../progress-linux.templates:5002 +msgid "" +"Please enter the Debian mirror (defaults to https://deb.debian.org/debian)." +msgstr "" + +#. Type: string +#. Default +#: ../progress-linux.templates:6001 +msgid "http://security.debian.org" +msgstr "" + +#. Type: string +#. Description +#: ../progress-linux.templates:6002 +msgid "default Debian security mirror" +msgstr "" + +#. Type: string +#. Description +#: ../progress-linux.templates:6002 +msgid "" +"Please enter the Debian security mirror (defaults to http://security.debian." +"org)." +msgstr "" diff --git a/debian/po/templates.pot b/debian/po/templates.pot index b2fbba3..dffa7ee 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-12 06:35+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -46,3 +46,62 @@ msgstr "" #: ../progress-linux.templates:3001 msgid "Please select the apt archive areas to setup." msgstr "" + +#. Type: string +#. Default +#: ../progress-linux.templates:4001 +msgid "https://cdn.deb.progress-linux.org/packages" +msgstr "" + +#. Type: string +#. Description +#: ../progress-linux.templates:4002 +msgid "default Progress Linux mirror" +msgstr "" + +#. Type: string +#. Description +#: ../progress-linux.templates:4002 +msgid "" +"Please enter the Progress Linux mirror (defaults to https://cdn.deb.progress-" +"linux.org/packages)." +msgstr "" + +#. Type: string +#. Default +#: ../progress-linux.templates:5001 +msgid "https://deb.debian.org/debian" +msgstr "" + +#. Type: string +#. Description +#: ../progress-linux.templates:5002 +msgid "default Debian mirror" +msgstr "" + +#. Type: string +#. Description +#: ../progress-linux.templates:5002 +msgid "" +"Please enter the Debian mirror (defaults to https://deb.debian.org/debian)." +msgstr "" + +#. Type: string +#. Default +#: ../progress-linux.templates:6001 +msgid "http://security.debian.org" +msgstr "" + +#. Type: string +#. Description +#: ../progress-linux.templates:6002 +msgid "default Debian security mirror" +msgstr "" + +#. Type: string +#. Description +#: ../progress-linux.templates:6002 +msgid "" +"Please enter the Debian security mirror (defaults to http://security.debian." +"org)." +msgstr "" diff --git a/debian/progress-linux.config b/debian/progress-linux.config index 3d74491..cdfe013 100755 --- a/debian/progress-linux.config +++ b/debian/progress-linux.config @@ -25,6 +25,16 @@ Run_debconf () db_input high ${PROJECT}/archive-areas || true db_go fi + + # apt mirrors + db_input low ${PROJECT}/mirror-progress-linux || true + db_go + + db_input low ${PROJECT}/mirror-debian || true + db_go + + db_input low ${PROJECT}/mirror-debian-security || true + db_go } DEBIAN_VERSION="$(cat /etc/debian_version)" diff --git a/debian/progress-linux.postinst b/debian/progress-linux.postinst index 8dc75c6..a87c66a 100755 --- a/debian/progress-linux.postinst +++ b/debian/progress-linux.postinst @@ -4,7 +4,6 @@ set -e PROJECT="progress-linux" DOMAIN="progress-linux.org" -PACKAGES="https://cdn.deb.progress-linux.org/packages" Install_apt_sources () { @@ -46,7 +45,7 @@ Configure_apt_sources () esac cat >> "/etc/apt/sources.list.d/${PROJECT}.list" << EOF -deb [signed-by=/usr/share/progress-linux/pgp-keys/apt.progress-linux.org.gpg] ${PACKAGES} ${ARCHIVE} ${AREAS} +deb [signed-by=/usr/share/progress-linux/pgp-keys/apt.progress-linux.org.gpg] ${MIRROR_PROGRESS_LINUX} ${ARCHIVE} ${AREAS} EOF } @@ -133,6 +132,15 @@ 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-progress-linux # string w/o empty + MIRROR_PROGRESS_LINUX="${RET:-https://cdn.deb.progress-linux.org/packages}" + + db_get ${PROJECT}/mirror-debian # string w/o empty + MIRROR_DEBIAN="${RET:-https://deb.debian.org/debian}" + + db_get ${PROJECT}/mirror-debian-security # string w/o empty + MIRROR_DEBIAN_SECURITY="${RET:-http://security.debian.org}" + db_stop BACKPORTS_PRIORITY="100" diff --git a/debian/progress-linux.templates b/debian/progress-linux.templates index 0972dc6..0ae6ca7 100644 --- a/debian/progress-linux.templates +++ b/debian/progress-linux.templates @@ -16,3 +16,24 @@ Choices: ${CHOICES} Default: _Description: setup apt archive areas: Please select the apt archive areas to setup. + +Template: progress-linux/mirror-progress-linux +Type: string +_Default: https://cdn.deb.progress-linux.org/packages +_Description: default Progress Linux mirror + Please enter the Progress Linux mirror (defaults to + https://cdn.deb.progress-linux.org/packages). + +Template: progress-linux/mirror-debian +Type: string +_Default: https://deb.debian.org/debian +_Description: default Debian mirror + Please enter the Debian mirror (defaults to + https://deb.debian.org/debian). + +Template: progress-linux/mirror-debian-security +Type: string +_Default: http://security.debian.org +_Description: default Debian security mirror + Please enter the Debian security mirror (defaults to + http://security.debian.org). -- cgit v1.2.3