Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
x-debbugs-cc: debian-edu@lists.debian.org
Dear release team,
this is a pre-approval unblock request for debian-edu-config fixing two
important bugs and updating a debconf translation:
$ head -17 debian/changelog
debian-edu-config (1.815) UNRELEASED; urgency=medium
[ Debconf translation updates ]
* Spanish by Manuel "Venturi" Porras Peralta (Closes: #772143)
[ Wolfgang Schweer ]
* Configure dovecot-core SSL support:
- cf/imap: Add shellcommand to create dovecot SSL certificate.
- share/debian-edu-config/tools: Add a script named
debian-edu-dovecot-create-cert which does what the name tells
and configures SSL support. The script is based upon code from
debian-lan-config, thanks to Andreas B. Mundt.
The package dovecot-core used to setup SSL support but dropped
it recently (Closes: #772163, #772162).
-- Holger Levsen <holger@debian.org> Fri, 05 Dec 2014 17:41:08 +0100
$ git diff 1.814..master | diffstat
Makefile | 1
cf/cf.imap | 3
debian/changelog | 17 ++++
debian/po/es.po | 44 +++++++----
share/debian-edu-config/tools/debian-edu-dovecot-create-cert | 29 +++++++
5 files changed, 79 insertions(+), 15 deletions(-)
$ git diff 1.814..master > 1.815.diff
See attached.
Thanks for your work on jessie!
cheers,
Holger
diff --git a/Makefile b/Makefile
index 24d5eb3..d450756 100644
--- a/Makefile
+++ b/Makefile
@@ -393,6 +393,7 @@ install: install-testsuite
share/debian-edu-config/tools/update-proxy-from-wpad \
share/debian-edu-config/tools/workaround-udev-bug-765577 \
share/debian-edu-config/tools/wpad-extract \
+ share/debian-edu-config/tools/debian-edu-dovecot-create-cert \
share/debian-edu-config/ltspfs-mounter-kde \
share/ltsp/get-ldap-ltsp-config \
share/ltsp/init-ltsp.d/08-edu-hostname \
diff --git a/cf/cf.imap b/cf/cf.imap
index 56fd94a..47c1560 100644
--- a/cf/cf.imap
+++ b/cf/cf.imap
@@ -6,3 +6,6 @@ shellcommands:
# warning message: ,,This message goes away after the first successful login.''
"/usr/bin/touch /var/lib/dovecot/auth-success"
+ # create dovecot ssl certificate because dovecot-core stopped doing it
+ # (Bug #772163).
+ "/usr/share/debian-edu-config/tools/debian-edu-dovecot-create-cert"
diff --git a/debian/changelog b/debian/changelog
index 7a7e6fd..bf5dc57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+debian-edu-config (1.815) UNRELEASED; urgency=medium
+
+ [ Debconf translation updates ]
+ * Spanish by Manuel "Venturi" Porras Peralta (Closes: #772143)
+
+ [ Wolfgang Schweer ]
+ * Configure dovecot-core SSL support:
+ - cf/imap: Add shellcommand to create dovecot SSL certificate.
+ - share/debian-edu-config/tools: Add a script named
+ debian-edu-dovecot-create-cert which does what the name tells
+ and configures SSL support. The script is based upon code from
+ debian-lan-config, thanks to Andreas B. Mundt.
+ The package dovecot-core used to setup SSL support but dropped
+ it recently (Closes: #772163, #772162).
+
+ -- Holger Levsen <holger@debian.org> Fri, 05 Dec 2014 17:41:08 +0100
+
debian-edu-config (1.814) unstable; urgency=low
[ Petter Reinholdtsen ]
diff --git a/debian/po/es.po b/debian/po/es.po
index f4f7214..fbcd26e 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -4,8 +4,9 @@
#
# Changes:
# - Initial translation
-# Javier Ruano Ruano , 2006
-#
+# Javier Ruano Ruano , 2006
+# -Updated
+# Manuel "Venturi" Porras Peralta <venturi@openmailbox.org>, 2014.
#
# Traductores, si no conoce el formato PO, merece la pena leer la
# documentación de gettext, especialmente las secciones dedicadas a este
@@ -34,13 +35,15 @@ msgstr ""
"Project-Id-Version: debian-edu-config\n"
"Report-Msgid-Bugs-To: debian-edu-config@packages.debian.org\n"
"POT-Creation-Date: 2013-05-22 15:09+0200\n"
-"PO-Revision-Date: 2007-01-17 02:19+0100\n"
-"Last-Translator: Javier Ruano Ruano <javier.ruano@estudiante.uam.es>\n"
-"Language-Team: Debian L10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
-"Language: \n"
+"PO-Revision-Date: 2014-12-02 18:49+0100\n"
+"Last-Translator: Manuel «Venturi» Porras Peralta <venturi@openmailbox.org>\n"
+"Language-Team: Español; Castellano <debian-l10n-spanish@lists.debian.org>\n"
+"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Gtranslator 2.91.6\n"
#. Type: boolean
#. Description
@@ -52,7 +55,7 @@ msgstr "¿Debería ejecutarse en el arranque el script «init.d/update-hostname
#. Description
#: ../debian-edu-config.templates:2001
msgid "Do you want to run enable-nat on your system?"
-msgstr "¿Desea ejecutar «enable-nat» en su sistema?"
+msgstr "¿Desea ejecutar «enable-nat» en el sistema?"
#. Type: boolean
#. Description
@@ -61,14 +64,14 @@ msgid ""
"The enable-nat script activates NAT for your Thin-Clients and overwrites "
"your iptables rules."
msgstr ""
-"El script «enable-nat» habilita NAT para sus clientes ligeros, y para ello, "
-"sobreescribirá las reglas de iptables."
+"El script «enable-nat» habilita NAT para los clientes ligeros y sobreescribe "
+"las reglas de iptables."
#. Type: password
#. Description
#: ../debian-edu-config.templates:4001
msgid "Enter the Kerberos KDC master key:"
-msgstr ""
+msgstr "Introduzca la clave maestra de Kerberos KDC:"
#. Type: password
#. Description
@@ -78,6 +81,9 @@ msgid ""
"You can use your root password or type something else. Make sure you "
"remember the password."
msgstr ""
+"Se necesita una contraseña como clave maestra de Kerberos y para todos los "
+"administradores predeterminados. Puede utilizar la contraseña de "
+"superusuario o introducir cualquier otra. Asegúrese de recordarla."
#. Type: password
#. Description
@@ -85,7 +91,7 @@ msgstr ""
#. Description
#: ../debian-edu-config.templates:4001 ../debian-edu-config.templates:9001
msgid "Note that you will not be able to see the password as you type it."
-msgstr ""
+msgstr "Tenga en cuenta que no podrá ver la contraseña mientras la introduce."
#. Type: password
#. Description
@@ -93,7 +99,7 @@ msgstr ""
#. Description
#: ../debian-edu-config.templates:5001 ../debian-edu-config.templates:10001
msgid "Re-enter password to verify:"
-msgstr ""
+msgstr "Vuelva a introducir la contraseña para verificarla:"
#. Type: password
#. Description
@@ -104,6 +110,8 @@ msgid ""
"Please enter the same password again to verify that you have typed it "
"correctly."
msgstr ""
+"Introduzca la misma contraseña de nuevo para verificar que la ha introducido "
+"correctamente."
#. Type: error
#. Description
@@ -111,7 +119,7 @@ msgstr ""
#. Description
#: ../debian-edu-config.templates:6001 ../debian-edu-config.templates:11001
msgid "Password input error"
-msgstr ""
+msgstr "Error al introducir la contraseña"
#. Type: error
#. Description
@@ -120,6 +128,7 @@ msgstr ""
#: ../debian-edu-config.templates:6001 ../debian-edu-config.templates:11001
msgid "The two passwords you entered were not the same. Please try again."
msgstr ""
+"Las dos contraseñas que ha introducido no son la misma. Inténtelo de nuevo."
#. Type: error
#. Description
@@ -127,7 +136,7 @@ msgstr ""
#. Description
#: ../debian-edu-config.templates:7001 ../debian-edu-config.templates:12001
msgid "Empty password"
-msgstr ""
+msgstr "Contraseña vacía"
#. Type: error
#. Description
@@ -138,12 +147,14 @@ msgid ""
"You entered an empty password, which is not allowed. Please choose a non-"
"empty password."
msgstr ""
+"Ha introducido una contraseña vacía y no está permitido. Elija una "
+"contraseña no vacía."
#. Type: password
#. Description
#: ../debian-edu-config.templates:9001
msgid "Enter the LDAP super-admin password:"
-msgstr ""
+msgstr "Introduzca la contraseña de superusuario de LDAP:"
#. Type: password
#. Description
@@ -153,3 +164,6 @@ msgid ""
"You can use your root password or type something else. Make sure you "
"remember the password."
msgstr ""
+"Se utiliza una contraseña como contraseña inicial para el usuario "
+"superadministrador de GOsa². Puede utilizar la contraseña de superusuario o "
+"introducir cualquier otra. Asegúrese de recordarla."
diff --git a/share/debian-edu-config/tools/debian-edu-dovecot-create-cert b/share/debian-edu-config/tools/debian-edu-dovecot-create-cert
new file mode 100755
index 0000000..37b95de
--- /dev/null
+++ b/share/debian-edu-config/tools/debian-edu-dovecot-create-cert
@@ -0,0 +1,29 @@
+#!/bin/bash
+#
+# Create a self-signed certificate for dovecot.
+# Based upon a script from debian-lan-config by Andreas B. Mundt.
+#
+
+set -e
+
+TEMPLATE="/usr/share/ssl-cert/ssleay.cnf"
+HostName="postoffice.intern"
+
+## Create dovecot certificate:
+CERT="/etc/dovecot/dovecot.pem"
+KEY="/etc/dovecot/private/dovecot.pem"
+CONF="/etc/dovecot/dovecot.cnf"
+
+if [ ! -f $CONF ] ; then
+ sed -e s#@HostName@#"$HostName"# $TEMPLATE > $CONF
+ echo "subjectAltName=DNS:$HostName,DNS:postoffice.intern" >> $CONF
+ openssl req -config $CONF -new -x509 -days 7000 -nodes -out $CERT -keyout $KEY
+ chmod 640 $KEY $CERT $CONF
+ chown root:dovecot $KEY $CERT
+ ## Switch on SSL:
+ sed -i -e "s/^ssl = no/ssl = yes/" \
+ -e "s/^#ssl_cert =/ssl_cert =/" \
+ -e "s/^#ssl_key =/ssl_key =/" /etc/dovecot/conf.d/10-ssl.conf
+else
+ echo "$CONF exists, nothing done!"
+fi
Attachment:
signature.asc
Description: This is a digitally signed message part.