From 4fc5dd96f48560f20a8b583adf14197389af46e6 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 30 Dec 2016 20:12:08 +0100 Subject: Adding debconf handling for hooks directory. Signed-off-by: Daniel Baumann --- debian/open-infrastructure-container-tools.config | 4 ++ .../open-infrastructure-container-tools.postinst | 4 ++ debian/open-infrastructure-container-tools.postrm | 1 + .../open-infrastructure-container-tools.templates | 10 ++++ debian/po/fr.po | 63 +++++++++++++++++----- debian/po/nl.po | 63 +++++++++++++++++----- debian/po/pt_BR.po | 63 +++++++++++++++++----- debian/po/templates.pot | 50 ++++++++++++----- 8 files changed, 206 insertions(+), 52 deletions(-) diff --git a/debian/open-infrastructure-container-tools.config b/debian/open-infrastructure-container-tools.config index ad0569c..79c393a 100644 --- a/debian/open-infrastructure-container-tools.config +++ b/debian/open-infrastructure-container-tools.config @@ -18,6 +18,10 @@ db_settitle open-infrastructure-container-tools/title db_input low open-infrastructure-container-tools/debconf || true db_go +db_settitle open-infrastructure-container-tools/title +db_input low open-infrastructure-container-tools/hooks || true +db_go + db_settitle open-infrastructure-container-tools/title db_input low open-infrastructure-container-tools/cache || true db_go diff --git a/debian/open-infrastructure-container-tools.postinst b/debian/open-infrastructure-container-tools.postinst index 4273247..f83879c 100755 --- a/debian/open-infrastructure-container-tools.postinst +++ b/debian/open-infrastructure-container-tools.postinst @@ -56,6 +56,9 @@ case "${1}" in db_get open-infrastructure-container-tools/debconf DEBCONF="${RET:-/etc/container-tools/debconf}" # string (w/o empty) + db_get open-infrastructure-container-tools/hooks + HOOKS="${RET:-/etc/container-tools/hooks}" # string (w/o empty) + db_get open-infrastructure-container-tools/cache CACHE="${RET:-/var/cache/container-tools}" # string (w/o empty) @@ -70,6 +73,7 @@ case "${1}" in Install "/var/lib/machines" "${MACHINES}" Install "/etc/container-tools/config" "${CONFIG}" Install "/etc/container-tools/debconf" "${DEBCONF}" + Install "/etc/container-tools/hooks" "${HOOKS}" Install "/var/cache/container-tools" "${CACHE}" update-alternatives --quiet --set container-tools_script "/usr/share/container-tools/scripts/${SCRIPT}" diff --git a/debian/open-infrastructure-container-tools.postrm b/debian/open-infrastructure-container-tools.postrm index 57ecc21..291cb66 100755 --- a/debian/open-infrastructure-container-tools.postrm +++ b/debian/open-infrastructure-container-tools.postrm @@ -32,6 +32,7 @@ case "${1}" in Remove /var/cache/container-tools Remove /etc/container-tools/debconf Remove /etc/container-tools/config + Remove /etc/container-tools/hooks Remove /var/lib/machines ;; diff --git a/debian/open-infrastructure-container-tools.templates b/debian/open-infrastructure-container-tools.templates index 1d50080..095703d 100644 --- a/debian/open-infrastructure-container-tools.templates +++ b/debian/open-infrastructure-container-tools.templates @@ -31,6 +31,16 @@ _Description: debconf directory: If unsure, use /etc/container-tools/debconf (default) or /srv/container/container-tools/debconf when using shared storage. +Template: open-infrastructure-container-tools/hooks +Type: string +_Default: /etc/container-tools/hooks +_Description: debconf directory: + Please specify the directory that will be used to store the container + hooks. + . + If unsure, use /etc/container-tools/hooks (default) or + /srv/container/container-tools/hooks when using shared storage. + Template: open-infrastructure-container-tools/cache Type: string _Default: /var/cache/container-tools diff --git a/debian/po/fr.po b/debian/po/fr.po index 56489a0..887b12e 100644 --- a/debian/po/fr.po +++ b/debian/po/fr.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: open-infrastructure-container-tools\n" "Report-Msgid-Bugs-To: open-infrastructure-container-tools@packages.debian." "org\n" -"POT-Creation-Date: 2016-12-04 02:44+0100\n" +"POT-Creation-Date: 2016-12-30 20:10+0100\n" "PO-Revision-Date: 2016-08-09 15:23+0100\n" "Last-Translator: Jean-Pierre Giraud \n" "Language-Team: French \n" @@ -91,9 +91,12 @@ msgstr "" msgid "/etc/container-tools/debconf" msgstr "/etc/container-tools/debconf" +#. Type: string +#. Description #. Type: string #. Description #: ../open-infrastructure-container-tools.templates:4002 +#: ../open-infrastructure-container-tools.templates:5002 msgid "debconf directory:" msgstr "Répertoire de la configuration Debian :" @@ -121,18 +124,52 @@ msgstr "" #. Type: string #. Default #: ../open-infrastructure-container-tools.templates:5001 +#, fuzzy +#| msgid "/etc/container-tools/config" +msgid "/etc/container-tools/hooks" +msgstr "/etc/container-tools/config" + +#. Type: string +#. Description +#: ../open-infrastructure-container-tools.templates:5002 +#, fuzzy +#| msgid "" +#| "Please specify the directory that will be used to store the containers." +msgid "" +"Please specify the directory that will be used to store the container hooks." +msgstr "" +"Veuillez indiquer le répertoire qui sera utilisé pour stocker les conteneurs." + +#. Type: string +#. Description +#: ../open-infrastructure-container-tools.templates:5002 +#, fuzzy +#| msgid "" +#| "If unsure, use /etc/container-tools/config (default) or /srv/container/" +#| "container-tools/config when using shared storage." +msgid "" +"If unsure, use /etc/container-tools/hooks (default) or /srv/container/" +"container-tools/hooks when using shared storage." +msgstr "" +"En cas de doute, utilisez /etc/container-tools/config (répertoire par " +"défaut) ou /srv/container/container-tools/config si vous utilisez un " +"stockage partagé." + +#. Type: string +#. Default +#: ../open-infrastructure-container-tools.templates:6001 msgid "/var/cache/container-tools" msgstr "/var/cache/container-tools" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:5002 +#: ../open-infrastructure-container-tools.templates:6002 msgid "cache directory:" msgstr "Répertoire cache :" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:5002 +#: ../open-infrastructure-container-tools.templates:6002 msgid "" "Please specify the directory that will be used to cache files during " "creation of containers." @@ -142,7 +179,7 @@ msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:5002 +#: ../open-infrastructure-container-tools.templates:6002 msgid "" "If unsure, use /var/cache/container-tools (default) or /srv/container/" "container-tools/cache when using shared storage." @@ -152,19 +189,19 @@ msgstr "" #. Type: select #. Choices -#: ../open-infrastructure-container-tools.templates:6001 +#: ../open-infrastructure-container-tools.templates:7001 msgid "${SCRIPT_CHOICES}" msgstr "${SCRIPT_CHOICES}" #. Type: select #. Description -#: ../open-infrastructure-container-tools.templates:6002 +#: ../open-infrastructure-container-tools.templates:7002 msgid "create script:" msgstr "Créez un script :" #. Type: select #. Description -#: ../open-infrastructure-container-tools.templates:6002 +#: ../open-infrastructure-container-tools.templates:7002 msgid "" "Please select the script that will be used by default to create containers." msgstr "" @@ -173,19 +210,19 @@ msgstr "" #. Type: select #. Description -#: ../open-infrastructure-container-tools.templates:6002 +#: ../open-infrastructure-container-tools.templates:7002 msgid "If unsure, use debian (default)." msgstr "En cas de doute, utilisez debian (par défaut)." #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:7002 +#: ../open-infrastructure-container-tools.templates:8002 msgid "IRC notifications:" msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:7002 +#: ../open-infrastructure-container-tools.templates:8002 msgid "" "The container command can send IRC notifications via irker to one or more " "(whitespace separated) IRC channels." @@ -193,7 +230,7 @@ msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:7002 +#: ../open-infrastructure-container-tools.templates:8002 msgid "" "The following example will send IRC notifications to the open-infrastructure " "channel on irc.oftc.net:" @@ -201,13 +238,13 @@ msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:7002 +#: ../open-infrastructure-container-tools.templates:8002 msgid " irc://irc.oftc.net:6668/open-infrastructure" msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:7002 +#: ../open-infrastructure-container-tools.templates:8002 #, fuzzy #| msgid "If unsure, use debian (default)." msgid "If unsure, leave empty (default)." diff --git a/debian/po/nl.po b/debian/po/nl.po index 1f550b5..7d5f169 100644 --- a/debian/po/nl.po +++ b/debian/po/nl.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: open-infrastructure-container-tools\n" "Report-Msgid-Bugs-To: open-infrastructure-container-tools@packages.debian." "org\n" -"POT-Creation-Date: 2016-12-04 02:44+0100\n" +"POT-Creation-Date: 2016-12-30 20:10+0100\n" "PO-Revision-Date: 2016-08-02 21:35+0200\n" "Last-Translator: Frans Spiesschaert \n" "Language-Team: Debian Dutch l10n Team \n" @@ -91,9 +91,12 @@ msgstr "" msgid "/etc/container-tools/debconf" msgstr "/etc/container-tools/debconf" +#. Type: string +#. Description #. Type: string #. Description #: ../open-infrastructure-container-tools.templates:4002 +#: ../open-infrastructure-container-tools.templates:5002 msgid "debconf directory:" msgstr "debconf-map:" @@ -121,18 +124,52 @@ msgstr "" #. Type: string #. Default #: ../open-infrastructure-container-tools.templates:5001 +#, fuzzy +#| msgid "/etc/container-tools/config" +msgid "/etc/container-tools/hooks" +msgstr "/etc/container-tools/config" + +#. Type: string +#. Description +#: ../open-infrastructure-container-tools.templates:5002 +#, fuzzy +#| msgid "" +#| "Please specify the directory that will be used to store the containers." +msgid "" +"Please specify the directory that will be used to store the container hooks." +msgstr "" +"Geef op welke map gebruikt zal worden om de containers in onder te brengen." + +#. Type: string +#. Description +#: ../open-infrastructure-container-tools.templates:5002 +#, fuzzy +#| msgid "" +#| "If unsure, use /etc/container-tools/config (default) or /srv/container/" +#| "container-tools/config when using shared storage." +msgid "" +"If unsure, use /etc/container-tools/hooks (default) or /srv/container/" +"container-tools/hooks when using shared storage." +msgstr "" +"Indien u twijfelt, gebruik dan /etc/container-tools/config (standaard) of /" +"srv/container/container-tools/config in het geval er gebruik gemaakt wordt " +"van gedeelde opslag." + +#. Type: string +#. Default +#: ../open-infrastructure-container-tools.templates:6001 msgid "/var/cache/container-tools" msgstr "/var/cache/container-tools" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:5002 +#: ../open-infrastructure-container-tools.templates:6002 msgid "cache directory:" msgstr "cache-map:" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:5002 +#: ../open-infrastructure-container-tools.templates:6002 msgid "" "Please specify the directory that will be used to cache files during " "creation of containers." @@ -142,7 +179,7 @@ msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:5002 +#: ../open-infrastructure-container-tools.templates:6002 msgid "" "If unsure, use /var/cache/container-tools (default) or /srv/container/" "container-tools/cache when using shared storage." @@ -153,19 +190,19 @@ msgstr "" #. Type: select #. Choices -#: ../open-infrastructure-container-tools.templates:6001 +#: ../open-infrastructure-container-tools.templates:7001 msgid "${SCRIPT_CHOICES}" msgstr "${SCRIPT_CHOICES}" #. Type: select #. Description -#: ../open-infrastructure-container-tools.templates:6002 +#: ../open-infrastructure-container-tools.templates:7002 msgid "create script:" msgstr "aanmaakscript:" #. Type: select #. Description -#: ../open-infrastructure-container-tools.templates:6002 +#: ../open-infrastructure-container-tools.templates:7002 msgid "" "Please select the script that will be used by default to create containers." msgstr "" @@ -173,19 +210,19 @@ msgstr "" #. Type: select #. Description -#: ../open-infrastructure-container-tools.templates:6002 +#: ../open-infrastructure-container-tools.templates:7002 msgid "If unsure, use debian (default)." msgstr "Indien u twijfelt, gebruik dan debian (standaard)." #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:7002 +#: ../open-infrastructure-container-tools.templates:8002 msgid "IRC notifications:" msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:7002 +#: ../open-infrastructure-container-tools.templates:8002 msgid "" "The container command can send IRC notifications via irker to one or more " "(whitespace separated) IRC channels." @@ -193,7 +230,7 @@ msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:7002 +#: ../open-infrastructure-container-tools.templates:8002 msgid "" "The following example will send IRC notifications to the open-infrastructure " "channel on irc.oftc.net:" @@ -201,13 +238,13 @@ msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:7002 +#: ../open-infrastructure-container-tools.templates:8002 msgid " irc://irc.oftc.net:6668/open-infrastructure" msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:7002 +#: ../open-infrastructure-container-tools.templates:8002 #, fuzzy #| msgid "If unsure, use debian (default)." msgid "If unsure, leave empty (default)." diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po index 977b6f4..e620088 100644 --- a/debian/po/pt_BR.po +++ b/debian/po/pt_BR.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: open-infrastructure-container-tools\n" "Report-Msgid-Bugs-To: open-infrastructure-container-tools@packages.debian." "org\n" -"POT-Creation-Date: 2016-12-04 02:44+0100\n" +"POT-Creation-Date: 2016-12-30 20:10+0100\n" "PO-Revision-Date: 2016-08-25 22:07-0300\n" "Last-Translator: Adriano Rafael Gomes \n" "Language-Team: Brazilian Portuguese \n" "Language-Team: LANGUAGE \n" @@ -84,9 +84,12 @@ msgstr "" msgid "/etc/container-tools/debconf" msgstr "" +#. Type: string +#. Description #. Type: string #. Description #: ../open-infrastructure-container-tools.templates:4002 +#: ../open-infrastructure-container-tools.templates:5002 msgid "debconf directory:" msgstr "" @@ -109,26 +112,47 @@ msgstr "" #. Type: string #. Default #: ../open-infrastructure-container-tools.templates:5001 -msgid "/var/cache/container-tools" +msgid "/etc/container-tools/hooks" msgstr "" #. Type: string #. Description #: ../open-infrastructure-container-tools.templates:5002 -msgid "cache directory:" +msgid "" +"Please specify the directory that will be used to store the container hooks." msgstr "" #. Type: string #. Description #: ../open-infrastructure-container-tools.templates:5002 msgid "" +"If unsure, use /etc/container-tools/hooks (default) or /srv/container/" +"container-tools/hooks when using shared storage." +msgstr "" + +#. Type: string +#. Default +#: ../open-infrastructure-container-tools.templates:6001 +msgid "/var/cache/container-tools" +msgstr "" + +#. Type: string +#. Description +#: ../open-infrastructure-container-tools.templates:6002 +msgid "cache directory:" +msgstr "" + +#. Type: string +#. Description +#: ../open-infrastructure-container-tools.templates:6002 +msgid "" "Please specify the directory that will be used to cache files during " "creation of containers." msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:5002 +#: ../open-infrastructure-container-tools.templates:6002 msgid "" "If unsure, use /var/cache/container-tools (default) or /srv/container/" "container-tools/cache when using shared storage." @@ -136,38 +160,38 @@ msgstr "" #. Type: select #. Choices -#: ../open-infrastructure-container-tools.templates:6001 +#: ../open-infrastructure-container-tools.templates:7001 msgid "${SCRIPT_CHOICES}" msgstr "" #. Type: select #. Description -#: ../open-infrastructure-container-tools.templates:6002 +#: ../open-infrastructure-container-tools.templates:7002 msgid "create script:" msgstr "" #. Type: select #. Description -#: ../open-infrastructure-container-tools.templates:6002 +#: ../open-infrastructure-container-tools.templates:7002 msgid "" "Please select the script that will be used by default to create containers." msgstr "" #. Type: select #. Description -#: ../open-infrastructure-container-tools.templates:6002 +#: ../open-infrastructure-container-tools.templates:7002 msgid "If unsure, use debian (default)." msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:7002 +#: ../open-infrastructure-container-tools.templates:8002 msgid "IRC notifications:" msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:7002 +#: ../open-infrastructure-container-tools.templates:8002 msgid "" "The container command can send IRC notifications via irker to one or more " "(whitespace separated) IRC channels." @@ -175,7 +199,7 @@ msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:7002 +#: ../open-infrastructure-container-tools.templates:8002 msgid "" "The following example will send IRC notifications to the open-infrastructure " "channel on irc.oftc.net:" @@ -183,12 +207,12 @@ msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:7002 +#: ../open-infrastructure-container-tools.templates:8002 msgid " irc://irc.oftc.net:6668/open-infrastructure" msgstr "" #. Type: string #. Description -#: ../open-infrastructure-container-tools.templates:7002 +#: ../open-infrastructure-container-tools.templates:8002 msgid "If unsure, leave empty (default)." msgstr "" -- cgit v1.2.3