[Pkg-sympa-commits] [sympa] 01/07: Fix packaging to support Apache >= 2.4 (#669803)
Emmanuel Bouthenot
kolter at alioth.debian.org
Tue Sep 24 21:48:27 UTC 2013
This is an automated email from the git hooks/post-receive script.
kolter pushed a commit to branch master
in repository sympa.
commit 41c4c839143d2e4c550685385ee1429d16818466
Author: Emmanuel Bouthenot <kolter at openics.org>
Date: Tue Sep 24 21:15:54 2013 +0000
Fix packaging to support Apache >= 2.4 (#669803)
---
debian/conf/apache | 4 -
debian/conf/apache-soap | 1 -
debian/conf/apache2/sympa-soap.conf | 10 ++
debian/conf/apache2/sympa.conf | 15 +++
debian/conf/httpd.conf-cgi | 15 ---
debian/conf/httpd.conf-fcgi | 22 ----
debian/config | 3 -
debian/po/cs.po | 44 ++++----
debian/po/da.po | 42 ++++----
debian/po/de.po | 42 ++++----
debian/po/es.po | 42 ++++----
debian/po/eu.po | 107 ++++++++++----------
debian/po/fr.po | 42 ++++----
debian/po/gl.po | 42 ++++----
debian/po/it.po | 40 ++++----
debian/po/ja.po | 44 ++++----
debian/po/nl.po | 36 +++----
debian/po/pt.po | 42 ++++----
debian/po/pt_BR.po | 43 ++++----
debian/po/ru.po | 42 ++++----
debian/po/sv.po | 40 ++++----
debian/po/templates.pot | 23 +----
debian/sympa.dirs | 1 +
debian/sympa.install | 7 +-
debian/sympa.links | 1 -
debian/sympa.lintian-overrides | 2 +-
debian/sympa.postinst | 112 +++++++++++----------
debian/sympa.postrm | 190 +++++++++++++++--------------------
debian/sympa.preinst | 8 +-
debian/templates | 7 --
30 files changed, 464 insertions(+), 605 deletions(-)
diff --git a/debian/conf/apache b/debian/conf/apache
deleted file mode 100644
index 5fc93c7..0000000
--- a/debian/conf/apache
+++ /dev/null
@@ -1,4 +0,0 @@
-# Apache configuration file for Sympa
-
-Alias /static-sympa /var/lib/sympa/static_content
-ScriptAlias /wws /usr/lib/cgi-bin/sympa/wwsympa-wrapper.fcgi
diff --git a/debian/conf/apache-soap b/debian/conf/apache-soap
deleted file mode 100644
index 39e8c17..0000000
--- a/debian/conf/apache-soap
+++ /dev/null
@@ -1 +0,0 @@
-ScriptAlias /sympasoap /usr/lib/cgi-bin/sympa/sympa_soap_server-wrapper.fcgi
diff --git a/debian/conf/apache2/sympa-soap.conf b/debian/conf/apache2/sympa-soap.conf
new file mode 100644
index 0000000..57e5f6b
--- /dev/null
+++ b/debian/conf/apache2/sympa-soap.conf
@@ -0,0 +1,10 @@
+#
+# Apache >> 2.4 configuration for Sympa (soap webservice)
+#
+
+<IfModule mod_fcgid.c>
+ ScriptAlias /sympasoap /usr/lib/cgi-bin/sympa/sympa_soap_server-wrapper.fcgi
+ <Directory /usr/lib/cgi-bin/sympa>
+ Require all granted
+ </Directory>
+</IfModule>
diff --git a/debian/conf/apache2/sympa.conf b/debian/conf/apache2/sympa.conf
new file mode 100644
index 0000000..c725e1c
--- /dev/null
+++ b/debian/conf/apache2/sympa.conf
@@ -0,0 +1,15 @@
+#
+# Apache >> 2.4 configuration for Sympa
+#
+
+<IfModule mod_fcgid.c>
+ Alias /static-sympa /var/lib/sympa/static_content
+ <Directory /var/lib/sympa/static_content>
+ Require all granted
+ </Directory>
+
+ ScriptAlias /wws /usr/lib/cgi-bin/sympa/wwsympa-wrapper.fcgi
+ <Directory /usr/lib/cgi-bin/sympa>
+ Require all granted
+ </Directory>
+</IfModule>
diff --git a/debian/conf/httpd.conf-cgi b/debian/conf/httpd.conf-cgi
deleted file mode 100644
index 52cdd3e..0000000
--- a/debian/conf/httpd.conf-cgi
+++ /dev/null
@@ -1,15 +0,0 @@
-#-- WWSYMPA begin
-# DO NOT REMOVE SURROUNDING COMMENTS
-
-# If you want to change the WWSympa CGI configuration, please do not
-# edit this portion of httpd.conf directly.
-
-# Instead, please put your WWSympa CGI specific configuration
-# into file /etc/sympa/httpd.conf-cgi
-# and then run `dpkg-reconfigure -plow sympa'
-
-AddHandler cgi-script .fcgi .cgi .pl .sh
-
-ScriptAlias /wws /usr/lib/cgi-bin/sympa/wwsympa.fcgi
-
-#-- WWSYMPA end
diff --git a/debian/conf/httpd.conf-fcgi b/debian/conf/httpd.conf-fcgi
deleted file mode 100644
index b82ed8a..0000000
--- a/debian/conf/httpd.conf-fcgi
+++ /dev/null
@@ -1,22 +0,0 @@
-#-- WWSYMPA begin
-# DO NOT REMOVE SURROUNDING COMMENTS
-
-# If you want to change the FastCGI configuration, please do not
-# edit this portion of httpd.conf directly.
-
-# Instead, please put your WWSympa CGI specific configuration
-# into file /etc/sympa/httpd.conf-fcgi
-# and then run `dpkg-reconfigure -plow sympa'
-
-<IfModule mod_fastcgi.c>
-AddHandler fastcgi-script .fcg .fcgi .fpl
-
-FastCgiServer /usr/lib/cgi-bin/sympa/wwsympa.fcgi -processes 2
-<Location /wws>
- SetHandler fastcgi-script
-</Location>
-
-ScriptAlias /wws /usr/lib/cgi-bin/sympa/wwsympa.fcgi
-</IfModule>
-
-#-- WWSYMPA end
diff --git a/debian/config b/debian/config
index 570b7b2..e91ec58 100644
--- a/debian/config
+++ b/debian/config
@@ -115,7 +115,6 @@ fi
db_get wwsympa/wwsympa_url
if [ -z "$RET" ]; then
wwsympa_url_default="http://${host}/wws"
-
# Get the url from sympa.conf
if [ -f "$conf" ]; then
wwsympa_url_conf=$(perl -nle 'if (/^\s*wwsympa_url\s+(.*)$/) {print $1;}' "$conf")
@@ -162,8 +161,6 @@ if [ "$webserver" != "none" ]; then
# Ask for soap usage
db_input medium sympa/use_soap || [ $? -eq 30 ]
db_go
- db_input high wwsympa/webserver_restart || [ $? -eq 30 ]
- db_go
fi
# Ask for spool directories removal
diff --git a/debian/po/cs.po b/debian/po/cs.po
index 705638e..bfeedae 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sympa\n"
"Report-Msgid-Bugs-To: sympa at packages.debian.org\n"
-"POT-Creation-Date: 2010-04-12 15:33+0200\n"
+"POT-Creation-Date: 2013-07-03 19:58+0000\n"
"PO-Revision-Date: 2010-07-24 21:05+0200\n"
"Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -167,13 +167,13 @@ msgstr "Chcete WWSympa spouštět s FastCGI?"
#: ../templates:7001
msgid ""
"FastCGI is an Apache module that makes WWSympa run much faster. This option "
-"will be activated only if the `libapache2-mod-fcgid' package is installed "
-"on your system. Please first make sure you installed this package. FastCGI "
-"is required for using the Sympa SOAP server."
+"will be activated only if the `libapache2-mod-fcgid' package is installed on "
+"your system. Please first make sure you installed this package. FastCGI is "
+"required for using the Sympa SOAP server."
msgstr ""
"FastCGI je modul do Apache, se kterým běží WWSympa mnohem rychleji. Tato "
-"možnost bude použita pouze v případě, že máte nainstalovaný balík „libapache2-"
-"mod-fcgid“. Nejprve se prosím přesvědčte, zda máte tento balík "
+"možnost bude použita pouze v případě, že máte nainstalovaný balík "
+"„libapache2-mod-fcgid“. Nejprve se prosím přesvědčte, zda máte tento balík "
"nainstalován. FastCGI je vyžadováno pro používání Sympa SOAP serveru."
#. Type: boolean
@@ -207,29 +207,12 @@ msgstr ""
#. Type: boolean
#. Description
#: ../templates:9001
-msgid "Do you want the Web server to be restarted after installation?"
-msgstr "Chcete po instalaci restartovat webový server?"
-
-#. Type: boolean
-#. Description
-#: ../templates:9001
-msgid ""
-"If you don't want the webserver to be restarted, please make sure that "
-"wwsympa and the Sympa SOAP server are not running or the database may "
-"contain duplicates."
-msgstr ""
-"Nechcete-li restartovat webový server, ujistěte se, že wwsympa a Sympa SOAP "
-"server neběží, protože jinak by mohla databáze obsahovat duplikáty."
-
-#. Type: boolean
-#. Description
-#: ../templates:10001
msgid "Should the web archives and the bounce directory be removed?"
msgstr "Mají se smazat webové archivy a adresář s vrácenými příspěvky?"
#. Type: boolean
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid ""
"If you used the default configuration, WWSympa web archives are located in /"
"var/lib/sympa/wwsarchive. The WWSympa bounce directory contains bounces (non-"
@@ -242,7 +225,7 @@ msgstr ""
#. Type: boolean
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid ""
"Please choose whether you want to remove the web archives and the bounce "
"directory."
@@ -250,6 +233,17 @@ msgstr ""
"Rozhodněte se, zda chcete odstranit webové archivy a adresář s vrácenými "
"příspěvky."
+#~ msgid "Do you want the Web server to be restarted after installation?"
+#~ msgstr "Chcete po instalaci restartovat webový server?"
+
+#~ msgid ""
+#~ "If you don't want the webserver to be restarted, please make sure that "
+#~ "wwsympa and the Sympa SOAP server are not running or the database may "
+#~ "contain duplicates."
+#~ msgstr ""
+#~ "Nechcete-li restartovat webový server, ujistěte se, že wwsympa a Sympa "
+#~ "SOAP server neběží, protože jinak by mohla databáze obsahovat duplikáty."
+
#~ msgid "Do you want S/MIME authentication and encryption?"
#~ msgstr "Chcete S/MIME autentizaci a šifrování?"
diff --git a/debian/po/da.po b/debian/po/da.po
index a295da2..6a235a7 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sympa\n"
"Report-Msgid-Bugs-To: sympa at packages.debian.org\n"
-"POT-Creation-Date: 2010-04-12 15:33+0200\n"
+"POT-Creation-Date: 2013-07-03 19:58+0000\n"
"PO-Revision-Date: 2011-05-14 01:44+0000\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
@@ -159,9 +159,9 @@ msgstr "Ønsker du at WWSympa skal køre med FastCFI?"
#: ../templates:7001
msgid ""
"FastCGI is an Apache module that makes WWSympa run much faster. This option "
-"will be activated only if the `libapache2-mod-fcgid' package is installed "
-"on your system. Please first make sure you installed this package. FastCGI "
-"is required for using the Sympa SOAP server."
+"will be activated only if the `libapache2-mod-fcgid' package is installed on "
+"your system. Please first make sure you installed this package. FastCGI is "
+"required for using the Sympa SOAP server."
msgstr ""
"FastCGI er et Apachemodul, som får WWSympa til at køre meget hurtigere. "
"Denne indstilling vil kun blive aktiveret, hvis pakken »libapache-mod-"
@@ -200,30 +200,12 @@ msgstr ""
#. Type: boolean
#. Description
#: ../templates:9001
-msgid "Do you want the Web server to be restarted after installation?"
-msgstr "Ønsker du at internetserveren skal genstartes efter installationen?"
-
-#. Type: boolean
-#. Description
-#: ../templates:9001
-msgid ""
-"If you don't want the webserver to be restarted, please make sure that "
-"wwsympa and the Sympa SOAP server are not running or the database may "
-"contain duplicates."
-msgstr ""
-"Hvis du ikke ønsker at internetserveren skal genstartes, så sikr dig at "
-"wwsympa og Sympas SOAP-server ikke kører ellers kan databasen indeholde "
-"duplikater."
-
-#. Type: boolean
-#. Description
-#: ../templates:10001
msgid "Should the web archives and the bounce directory be removed?"
msgstr "Skal internetarkiverne og mappen bounce fjernes?"
#. Type: boolean
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid ""
"If you used the default configuration, WWSympa web archives are located in /"
"var/lib/sympa/wwsarchive. The WWSympa bounce directory contains bounces (non-"
@@ -236,9 +218,21 @@ msgstr ""
#. Type: boolean
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid ""
"Please choose whether you want to remove the web archives and the bounce "
"directory."
msgstr ""
"Vælg venligst om du ønsker at fjerne internetarkiverne og mappen bounce."
+
+#~ msgid "Do you want the Web server to be restarted after installation?"
+#~ msgstr "Ønsker du at internetserveren skal genstartes efter installationen?"
+
+#~ msgid ""
+#~ "If you don't want the webserver to be restarted, please make sure that "
+#~ "wwsympa and the Sympa SOAP server are not running or the database may "
+#~ "contain duplicates."
+#~ msgstr ""
+#~ "Hvis du ikke ønsker at internetserveren skal genstartes, så sikr dig at "
+#~ "wwsympa og Sympas SOAP-server ikke kører ellers kan databasen indeholde "
+#~ "duplikater."
diff --git a/debian/po/de.po b/debian/po/de.po
index 7aff905..c075c82 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sympa 6.0.1-1\n"
"Report-Msgid-Bugs-To: sympa at packages.debian.org\n"
-"POT-Creation-Date: 2010-04-12 15:33+0200\n"
+"POT-Creation-Date: 2013-07-03 19:58+0000\n"
"PO-Revision-Date: 2010-04-15 19:26+0200\n"
"Last-Translator: Helge Kreutzmann <debian at helgefjell.de>\n"
"Language-Team: de <debian-l10n-german at lists.debian.org>\n"
@@ -165,9 +165,9 @@ msgstr "Soll WWSympa mit FastCGI ausgef
#: ../templates:7001
msgid ""
"FastCGI is an Apache module that makes WWSympa run much faster. This option "
-"will be activated only if the `libapache2-mod-fcgid' package is installed "
-"on your system. Please first make sure you installed this package. FastCGI "
-"is required for using the Sympa SOAP server."
+"will be activated only if the `libapache2-mod-fcgid' package is installed on "
+"your system. Please first make sure you installed this package. FastCGI is "
+"required for using the Sympa SOAP server."
msgstr ""
"FastCGI ist ein Apache-Modul, das WWSympa beschleunigt. Diese Option steht "
"nur zur Auswahl, falls das Paket �libapache2-mod-fcgid� installiert ist. "
@@ -207,30 +207,12 @@ msgstr ""
#. Type: boolean
#. Description
#: ../templates:9001
-msgid "Do you want the Web server to be restarted after installation?"
-msgstr "Soll der Webserver nach der Installation neu gestartet werden?"
-
-#. Type: boolean
-#. Description
-#: ../templates:9001
-msgid ""
-"If you don't want the webserver to be restarted, please make sure that "
-"wwsympa and the Sympa SOAP server are not running or the database may "
-"contain duplicates."
-msgstr ""
-"Falls Sie nicht m�chten, dass der Webserver neu gestartet wird, stellen Sie "
-"sicher, dass Wwsympa und der Sympa-SOAP-Server nicht laufen, ansonsten "
-"k�nnte die Datenbank Dubletten enthalten."
-
-#. Type: boolean
-#. Description
-#: ../templates:10001
msgid "Should the web archives and the bounce directory be removed?"
msgstr "Sollen die Webarchive und das Bounce-Verzeichnis gel�scht werden?"
#. Type: boolean
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid ""
"If you used the default configuration, WWSympa web archives are located in /"
"var/lib/sympa/wwsarchive. The WWSympa bounce directory contains bounces (non-"
@@ -243,7 +225,7 @@ msgstr ""
#. Type: boolean
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid ""
"Please choose whether you want to remove the web archives and the bounce "
"directory."
@@ -251,6 +233,18 @@ msgstr ""
"W�hlen Sie aus, ob Sie die WWW-Archive und das Verzeichnis f�r Bounces "
"entfernt haben m�chten."
+#~ msgid "Do you want the Web server to be restarted after installation?"
+#~ msgstr "Soll der Webserver nach der Installation neu gestartet werden?"
+
+#~ msgid ""
+#~ "If you don't want the webserver to be restarted, please make sure that "
+#~ "wwsympa and the Sympa SOAP server are not running or the database may "
+#~ "contain duplicates."
+#~ msgstr ""
+#~ "Falls Sie nicht m�chten, dass der Webserver neu gestartet wird, stellen "
+#~ "Sie sicher, dass Wwsympa und der Sympa-SOAP-Server nicht laufen, "
+#~ "ansonsten k�nnte die Datenbank Dubletten enthalten."
+
#~ msgid "Do you want S/MIME authentication and encryption?"
#~ msgstr "M�chten Sie S/MIME-Authentifizierung und Verschl�sselung benutzen?"
diff --git a/debian/po/es.po b/debian/po/es.po
index b7cbfad..11938fb 100644
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -28,7 +28,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sympa 6.0.1+dfsg-2\n"
"Report-Msgid-Bugs-To: sympa at packages.debian.org\n"
-"POT-Creation-Date: 2010-04-12 15:33+0200\n"
+"POT-Creation-Date: 2013-07-03 19:58+0000\n"
"PO-Revision-Date: 2010-05-20 09:58+0100\n"
"Last-Translator: Francisco Javier Cuadrado <fcocuadrado at gmail.com>\n"
"Language-Team: Debian l10n Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -189,9 +189,9 @@ msgstr "¿Desea ejecutar WWSympa con FastCGI?"
#: ../templates:7001
msgid ""
"FastCGI is an Apache module that makes WWSympa run much faster. This option "
-"will be activated only if the `libapache2-mod-fcgid' package is installed "
-"on your system. Please first make sure you installed this package. FastCGI "
-"is required for using the Sympa SOAP server."
+"will be activated only if the `libapache2-mod-fcgid' package is installed on "
+"your system. Please first make sure you installed this package. FastCGI is "
+"required for using the Sympa SOAP server."
msgstr ""
"FastCGI es un módulo de Apache que hace que WWSympa se ejecute mucho más "
"rápido. Esta opción se activará sólo si el paquete «libapache2-mod-fcgid» "
@@ -231,30 +231,12 @@ msgstr ""
#. Type: boolean
#. Description
#: ../templates:9001
-msgid "Do you want the Web server to be restarted after installation?"
-msgstr "¿Desea reiniciar el servidor web después de la instalación?"
-
-#. Type: boolean
-#. Description
-#: ../templates:9001
-msgid ""
-"If you don't want the webserver to be restarted, please make sure that "
-"wwsympa and the Sympa SOAP server are not running or the database may "
-"contain duplicates."
-msgstr ""
-"Si no quiere que se reinicie el servidor web, asegúrese de que no se están "
-"ejecutando ni WWSympa ni el servidor SOAP de Sympa, o la base de datos podrá "
-"contener duplicados."
-
-#. Type: boolean
-#. Description
-#: ../templates:10001
msgid "Should the web archives and the bounce directory be removed?"
msgstr "¿Se deberían borrar los archivos web y el directorio «bounce»?"
#. Type: boolean
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid ""
"If you used the default configuration, WWSympa web archives are located in /"
"var/lib/sympa/wwsarchive. The WWSympa bounce directory contains bounces (non-"
@@ -267,8 +249,20 @@ msgstr ""
#. Type: boolean
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid ""
"Please choose whether you want to remove the web archives and the bounce "
"directory."
msgstr "Escoja si quiere borrar los archivos web y el directorio «bounce»."
+
+#~ msgid "Do you want the Web server to be restarted after installation?"
+#~ msgstr "¿Desea reiniciar el servidor web después de la instalación?"
+
+#~ msgid ""
+#~ "If you don't want the webserver to be restarted, please make sure that "
+#~ "wwsympa and the Sympa SOAP server are not running or the database may "
+#~ "contain duplicates."
+#~ msgstr ""
+#~ "Si no quiere que se reinicie el servidor web, asegúrese de que no se "
+#~ "están ejecutando ni WWSympa ni el servidor SOAP de Sympa, o la base de "
+#~ "datos podrá contener duplicados."
diff --git a/debian/po/eu.po b/debian/po/eu.po
index ffd925f..432f6e6 100644
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sympa_6.0.1+dfsg-2.1_eu\n"
"Report-Msgid-Bugs-To: sympa at packages.debian.org\n"
-"POT-Creation-Date: 2010-04-12 15:33+0200\n"
+"POT-Creation-Date: 2013-07-03 19:58+0000\n"
"PO-Revision-Date: 2010-07-27 11:09+0200\n"
"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo at euskalgnu.org>\n"
"Language-Team: Basque <debian-l10n-basque at lists.debian.org>\n"
@@ -34,8 +34,10 @@ msgstr "Sympa-ren ostalari-izena:"
#. Type: string
#. Description
#: ../templates:2001
-msgid "This is the name of the machine or the alias you will use to reach sympa."
-msgstr "Hau sympa atzitzeko erabiliko duzun ordenagailuaren izena edo ezizena da,"
+msgid ""
+"This is the name of the machine or the alias you will use to reach sympa."
+msgstr ""
+"Hau sympa atzitzeko erabiliko duzun ordenagailuaren izena edo ezizena da,"
#. Type: string
#. Description
@@ -95,7 +97,8 @@ msgstr " postmaster at makina.eu, root at home.makina.eu"
#. Description
#: ../templates:4001
msgid "Should lists home and spool directories be removed?"
-msgstr "Zerrenden direktorio nagusia eta ilararen direktorioak ezabatu behar dira?"
+msgstr ""
+"Zerrenden direktorio nagusia eta ilararen direktorioak ezabatu behar dira?"
#. Type: boolean
#. Description
@@ -106,23 +109,28 @@ msgid ""
"sympa is configured for using S/MIME encryption and authentication). The "
"spool directory (/var/spool/sympa) contains various queue directories."
msgstr ""
-"Zerrenden direktorio nagusiak (/var/lib/sympa) honako edukia du: "
-"posta-zerrenden konfigurazioak, posta-zerrenden biltegiak eta "
-"S/MIME erabiltzaile-ziurtagiriak (sympa S/MIME enkriptazio eta autentifikazioa erabiltzeko "
-"konfiguratuta dagoen kasuetan). Ilararen direktorioan (/var/spool/sympa) hainbat "
-"ilara desberdinen direktorioak daude."
+"Zerrenden direktorio nagusiak (/var/lib/sympa) honako edukia du: posta-"
+"zerrenden konfigurazioak, posta-zerrenden biltegiak eta S/MIME erabiltzaile-"
+"ziurtagiriak (sympa S/MIME enkriptazio eta autentifikazioa erabiltzeko "
+"konfiguratuta dagoen kasuetan). Ilararen direktorioan (/var/spool/sympa) "
+"hainbat ilara desberdinen direktorioak daude."
#. Type: boolean
#. Description
#: ../templates:4001
-msgid "Note that if those directories are empty, they will be automatically removed."
-msgstr "Kontutan izan direktorio horiek hutsik badaude automatikoki ezabatuko direla."
+msgid ""
+"Note that if those directories are empty, they will be automatically removed."
+msgstr ""
+"Kontutan izan direktorio horiek hutsik badaude automatikoki ezabatuko direla."
#. Type: boolean
#. Description
#: ../templates:4001
-msgid "Please choose whether you want to remove lists home and spool directories."
-msgstr "Aukeratu zerrenden direktorio nagusia eta ilaren direktorioak ezabatu nahi dituzun ala ez."
+msgid ""
+"Please choose whether you want to remove lists home and spool directories."
+msgstr ""
+"Aukeratu zerrenden direktorio nagusia eta ilaren direktorioak ezabatu nahi "
+"dituzun ala ez."
#. Type: string
#. Description
@@ -159,15 +167,15 @@ msgstr "Nahi duzu WWSympa-k FastCGI erabiltzea?"
#: ../templates:7001
msgid ""
"FastCGI is an Apache module that makes WWSympa run much faster. This option "
-"will be activated only if the `libapache2-mod-fcgid' package is installed "
-"on your system. Please first make sure you installed this package. FastCGI "
-"is required for using the Sympa SOAP server."
+"will be activated only if the `libapache2-mod-fcgid' package is installed on "
+"your system. Please first make sure you installed this package. FastCGI is "
+"required for using the Sympa SOAP server."
msgstr ""
"FastCGI Apache-ren modulu bat da, eta horren bitartez WWSympa askoz "
-"azkarrago exekutatzea lortzen da. Aukera hau aktibatzeko "
-"`libapache2-mod-fcgid' paketea instalatuta egon beharko luke. "
-"Ziurtatu zaitez pakete hori instalatuta dagoela. FastCGI beharrezkoa "
-"da Sympa SOAP zerbitzaria erabiltzeko."
+"azkarrago exekutatzea lortzen da. Aukera hau aktibatzeko `libapache2-mod-"
+"fcgid' paketea instalatuta egon beharko luke. Ziurtatu zaitez pakete hori "
+"instalatuta dagoela. FastCGI beharrezkoa da Sympa SOAP zerbitzaria "
+"erabiltzeko."
#. Type: boolean
#. Description
@@ -186,60 +194,55 @@ msgid ""
msgstr ""
"Sympa SOAP zerbitzariak edozer programazio hizkuntza eta edozer "
"ordenagailutik beste programa batzuen bitartez Sympa zerbitzua atzitzeko "
-"aukera ematen du. SOAP zerbitzariak maila altuko funtzioen multzo "
-"mugatu batez hornitzen du, hala nola 'login', 'which', 'lists', 'subscribe' "
-" eta 'signoff'."
+"aukera ematen du. SOAP zerbitzariak maila altuko funtzioen multzo mugatu "
+"batez hornitzen du, hala nola 'login', 'which', 'lists', 'subscribe' eta "
+"'signoff'."
#. Type: boolean
#. Description
#: ../templates:8001
-msgid "The SOAP server uses libsoap-lite-perl package and a webserver like apache."
-msgstr ""
-"SOAP zerbitzariak 'libsoap-lite-perl' paketea eta apache bezalako "
-"web zerbitzari bat erabiltzen du."
-
-#. Type: boolean
-#. Description
-#: ../templates:9001
-msgid "Do you want the Web server to be restarted after installation?"
-msgstr "Instalazioaren ondoren, web zerbitzaria berrabiaraztea nahi duzu?"
-
-#. Type: boolean
-#. Description
-#: ../templates:9001
msgid ""
-"If you don't want the webserver to be restarted, please make sure that "
-"wwsympa and the Sympa SOAP server are not running or the database may "
-"contain duplicates."
+"The SOAP server uses libsoap-lite-perl package and a webserver like apache."
msgstr ""
-"Ez baduzu web zerbitzaria berrabiarazterik nahi, ziurtatu zaitez "
-"wwsympa eta Sympa SOAP zerbitzaria ez daudela martxan, bestela "
-"datu-baseak bikoizketak eduki ditzake."
+"SOAP zerbitzariak 'libsoap-lite-perl' paketea eta apache bezalako web "
+"zerbitzari bat erabiltzen du."
#. Type: boolean
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid "Should the web archives and the bounce directory be removed?"
msgstr "Web fitxategiak eta errebote-direktorioa ezabatu behar dira?"
#. Type: boolean
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid ""
"If you used the default configuration, WWSympa web archives are located in /"
"var/lib/sympa/wwsarchive. The WWSympa bounce directory contains bounces (non-"
"delivery reports) and is set to /var/spool/sympa/wwsbounce by default."
msgstr ""
-"Lehenetsitako konfigurazioa erabiltzen baduzu, WWSympa web fitxategiak "
-"/var/lib/sympa/wwsarchive-en kokatuta egongo dira. WWSympa-ren "
-"errebote-direktorioak errebotatutako (bidali gabeko) txostenak ditu "
-"eta lehenespenez /var/spool/sympa/wwsbounce direktorioan kokatzen da."
+"Lehenetsitako konfigurazioa erabiltzen baduzu, WWSympa web fitxategiak /var/"
+"lib/sympa/wwsarchive-en kokatuta egongo dira. WWSympa-ren errebote-"
+"direktorioak errebotatutako (bidali gabeko) txostenak ditu eta lehenespenez /"
+"var/spool/sympa/wwsbounce direktorioan kokatzen da."
#. Type: boolean
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid ""
"Please choose whether you want to remove the web archives and the bounce "
"directory."
-msgstr "Hautatu web fitxategiak eta errebote-direktorioa ezabatu nahi duzun ala ez."
-
+msgstr ""
+"Hautatu web fitxategiak eta errebote-direktorioa ezabatu nahi duzun ala ez."
+
+#~ msgid "Do you want the Web server to be restarted after installation?"
+#~ msgstr "Instalazioaren ondoren, web zerbitzaria berrabiaraztea nahi duzu?"
+
+#~ msgid ""
+#~ "If you don't want the webserver to be restarted, please make sure that "
+#~ "wwsympa and the Sympa SOAP server are not running or the database may "
+#~ "contain duplicates."
+#~ msgstr ""
+#~ "Ez baduzu web zerbitzaria berrabiarazterik nahi, ziurtatu zaitez wwsympa "
+#~ "eta Sympa SOAP zerbitzaria ez daudela martxan, bestela datu-baseak "
+#~ "bikoizketak eduki ditzake."
diff --git a/debian/po/fr.po b/debian/po/fr.po
index d293cb6..3f061ed 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: sympa at packages.debian.org\n"
-"POT-Creation-Date: 2010-04-12 15:33+0200\n"
+"POT-Creation-Date: 2013-07-03 19:58+0000\n"
"PO-Revision-Date: 2010-04-14 10:02+0200\n"
"Last-Translator: Christian Perrier <bubulle at debian.org>\n"
"Language-Team: fr <debian-l10n-french at lists.debian.org>\n"
@@ -170,9 +170,9 @@ msgstr "Voulez-vous utiliser WWSympa avec FastCGI ?"
#: ../templates:7001
msgid ""
"FastCGI is an Apache module that makes WWSympa run much faster. This option "
-"will be activated only if the `libapache2-mod-fcgid' package is installed "
-"on your system. Please first make sure you installed this package. FastCGI "
-"is required for using the Sympa SOAP server."
+"will be activated only if the `libapache2-mod-fcgid' package is installed on "
+"your system. Please first make sure you installed this package. FastCGI is "
+"required for using the Sympa SOAP server."
msgstr ""
"FastCGI est un module Apache qui permet d'exécuter WWSympa plus rapidement. "
"Cette option ne pourra être activée que si le paquet « libapache-mod-"
@@ -213,24 +213,6 @@ msgstr ""
#. Type: boolean
#. Description
#: ../templates:9001
-msgid "Do you want the Web server to be restarted after installation?"
-msgstr "Voulez-vous redémarrer le serveur Web après l'installation ?"
-
-#. Type: boolean
-#. Description
-#: ../templates:9001
-msgid ""
-"If you don't want the webserver to be restarted, please make sure that "
-"wwsympa and the Sympa SOAP server are not running or the database may "
-"contain duplicates."
-msgstr ""
-"Si vous ne souhaitez pas que le serveur web soit redémarré, veuillez "
-"contrôler que wwsympa et le serveur SOAP ne sont pas actifs, sinon la base "
-"de données risque de contenir des doublons."
-
-#. Type: boolean
-#. Description
-#: ../templates:10001
msgid "Should the web archives and the bounce directory be removed?"
msgstr ""
"Supprimer les archives web et le répertoire de rejets lors de la purge de "
@@ -238,7 +220,7 @@ msgstr ""
#. Type: boolean
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid ""
"If you used the default configuration, WWSympa web archives are located in /"
"var/lib/sympa/wwsarchive. The WWSympa bounce directory contains bounces (non-"
@@ -252,7 +234,7 @@ msgstr ""
#. Type: boolean
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid ""
"Please choose whether you want to remove the web archives and the bounce "
"directory."
@@ -260,6 +242,18 @@ msgstr ""
"Veuillez choisir si vous souhaitez supprimer les archives web et le sous-"
"répertoire de rejets au moment de l'exécution de « dpkg --purge sympa »."
+#~ msgid "Do you want the Web server to be restarted after installation?"
+#~ msgstr "Voulez-vous redémarrer le serveur Web après l'installation ?"
+
+#~ msgid ""
+#~ "If you don't want the webserver to be restarted, please make sure that "
+#~ "wwsympa and the Sympa SOAP server are not running or the database may "
+#~ "contain duplicates."
+#~ msgstr ""
+#~ "Si vous ne souhaitez pas que le serveur web soit redémarré, veuillez "
+#~ "contrôler que wwsympa et le serveur SOAP ne sont pas actifs, sinon la "
+#~ "base de données risque de contenir des doublons."
+
#~ msgid "Do you want S/MIME authentication and encryption?"
#~ msgstr ""
#~ "Voulez-vous utiliser S/MIME pour l'authentification et le chiffrement ?"
diff --git a/debian/po/gl.po b/debian/po/gl.po
index a3f3b87..a88d935 100644
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sympa\n"
"Report-Msgid-Bugs-To: sympa at packages.debian.org\n"
-"POT-Creation-Date: 2010-04-12 15:33+0200\n"
+"POT-Creation-Date: 2013-07-03 19:58+0000\n"
"PO-Revision-Date: 2008-05-13 01:02+0100\n"
"Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
"Language-Team: Galician <proxecto at trasno.net>\n"
@@ -161,9 +161,9 @@ msgstr "¿Quere executar WWSympa con FastCGI?"
#: ../templates:7001
msgid ""
"FastCGI is an Apache module that makes WWSympa run much faster. This option "
-"will be activated only if the `libapache2-mod-fcgid' package is installed "
-"on your system. Please first make sure you installed this package. FastCGI "
-"is required for using the Sympa SOAP server."
+"will be activated only if the `libapache2-mod-fcgid' package is installed on "
+"your system. Please first make sure you installed this package. FastCGI is "
+"required for using the Sympa SOAP server."
msgstr ""
"FastCGI é un módulo de Apache que fai que WWSympa funcione moito máis "
"rápido. Esta opción ha activarse só se o paquete \"libapache2-mod-fcgid\" "
@@ -202,31 +202,13 @@ msgstr ""
#. Type: boolean
#. Description
#: ../templates:9001
-msgid "Do you want the Web server to be restarted after installation?"
-msgstr "¿Quere reiniciar o servidor web despois da instalación?"
-
-#. Type: boolean
-#. Description
-#: ../templates:9001
-msgid ""
-"If you don't want the webserver to be restarted, please make sure that "
-"wwsympa and the Sympa SOAP server are not running or the database may "
-"contain duplicates."
-msgstr ""
-"Se non quere reiniciar o servidor web, asegúrese de que wwsympa e o servidor "
-"SOAP de Sympa non estean a funcionar, ou a base de datos ha poder conter "
-"duplicados."
-
-#. Type: boolean
-#. Description
-#: ../templates:10001
msgid "Should the web archives and the bounce directory be removed?"
msgstr ""
"¿Quere eliminar os arquivos da web e o directorio de mensaxes rebotadas?"
#. Type: boolean
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid ""
"If you used the default configuration, WWSympa web archives are located in /"
"var/lib/sympa/wwsarchive. The WWSympa bounce directory contains bounces (non-"
@@ -239,7 +221,7 @@ msgstr ""
#. Type: boolean
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid ""
"Please choose whether you want to remove the web archives and the bounce "
"directory."
@@ -247,6 +229,18 @@ msgstr ""
"Indique se quere eliminar os arquivos en web e o directorio de mensaxes "
"devoltas."
+#~ msgid "Do you want the Web server to be restarted after installation?"
+#~ msgstr "¿Quere reiniciar o servidor web despois da instalación?"
+
+#~ msgid ""
+#~ "If you don't want the webserver to be restarted, please make sure that "
+#~ "wwsympa and the Sympa SOAP server are not running or the database may "
+#~ "contain duplicates."
+#~ msgstr ""
+#~ "Se non quere reiniciar o servidor web, asegúrese de que wwsympa e o "
+#~ "servidor SOAP de Sympa non estean a funcionar, ou a base de datos ha "
+#~ "poder conter duplicados."
+
#~ msgid "Do you want S/MIME authentication and encryption?"
#~ msgstr "¿Quere autenticación e cifrado S/MIME?"
diff --git a/debian/po/it.po b/debian/po/it.po
index eba98b8..1dc7dfc 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sympa\n"
"Report-Msgid-Bugs-To: sympa at packages.debian.org\n"
-"POT-Creation-Date: 2011-11-27 16:44+0000\n"
+"POT-Creation-Date: 2013-07-03 19:58+0000\n"
"PO-Revision-Date: 2012-04-02 16:38+0200\n"
"Last-Translator: Beatrice Torracca <beatricet at libero.it>\n"
"Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
@@ -110,8 +110,8 @@ msgid ""
"spool directory (/var/spool/sympa) contains various queue directories."
msgstr ""
"La directory home delle liste (/var/lib/sympa) contiene le configurazioni "
-"delle mailing list, gli archivi delle mailing list e i certificati utente "
-"S/MIME (quando sympa è stato configurato per usare la cifratura e "
+"delle mailing list, gli archivi delle mailing list e i certificati utente S/"
+"MIME (quando sympa è stato configurato per usare la cifratura e "
"l'autenticazione S/MIME). La directory di spool (/var/spool/sympa) contiene "
"varie directory con code."
@@ -208,30 +208,12 @@ msgstr ""
#. Type: boolean
#. Description
#: ../templates:9001
-msgid "Do you want the Web server to be restarted after installation?"
-msgstr "Riavviare il server web dopo l'installazione?"
-
-#. Type: boolean
-#. Description
-#: ../templates:9001
-msgid ""
-"If you don't want the webserver to be restarted, please make sure that "
-"wwsympa and the Sympa SOAP server are not running or the database may "
-"contain duplicates."
-msgstr ""
-"Se non si desidera riavviare il server web, assicurarsi che wwsympa e il "
-"server SOAP Sympa non siano in esecuzione o il database potrebbe contenere "
-"duplicati."
-
-#. Type: boolean
-#. Description
-#: ../templates:10001
msgid "Should the web archives and the bounce directory be removed?"
msgstr "Eliminare gli archivi web e la directory di bounce?"
#. Type: boolean
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid ""
"If you used the default configuration, WWSympa web archives are located in /"
"var/lib/sympa/wwsarchive. The WWSympa bounce directory contains bounces (non-"
@@ -244,8 +226,20 @@ msgstr ""
#. Type: boolean
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid ""
"Please choose whether you want to remove the web archives and the bounce "
"directory."
msgstr "Scegliere se rimuovere gli archivi web e la directory di bounce."
+
+#~ msgid "Do you want the Web server to be restarted after installation?"
+#~ msgstr "Riavviare il server web dopo l'installazione?"
+
+#~ msgid ""
+#~ "If you don't want the webserver to be restarted, please make sure that "
+#~ "wwsympa and the Sympa SOAP server are not running or the database may "
+#~ "contain duplicates."
+#~ msgstr ""
+#~ "Se non si desidera riavviare il server web, assicurarsi che wwsympa e il "
+#~ "server SOAP Sympa non siano in esecuzione o il database potrebbe "
+#~ "contenere duplicati."
diff --git a/debian/po/ja.po b/debian/po/ja.po
index f3581cb..aaa8206 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -1,12 +1,12 @@
# Copyright (C) 2009-2010 Stefan Hornburg (Racke) <racke at linuxia.de>
# This file is distributed under the same license as the sympa package.
# Hideki Yamane <henrich at debian.org>, 2009-2010.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: sympa 5.3.4-5\n"
"Report-Msgid-Bugs-To: sympa at packages.debian.org\n"
-"POT-Creation-Date: 2010-04-12 15:33+0200\n"
+"POT-Creation-Date: 2013-07-03 19:58+0000\n"
"PO-Revision-Date: 2010-07-25 14:19+0900\n"
"Last-Translator: Hideki Yamane <henrich at debian.org>\n"
"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -161,9 +161,9 @@ msgstr "WWSympa で FastCGI を有効にして動作させますか?"
#: ../templates:7001
msgid ""
"FastCGI is an Apache module that makes WWSympa run much faster. This option "
-"will be activated only if the `libapache2-mod-fcgid' package is installed "
-"on your system. Please first make sure you installed this package. FastCGI "
-"is required for using the Sympa SOAP server."
+"will be activated only if the `libapache2-mod-fcgid' package is installed on "
+"your system. Please first make sure you installed this package. FastCGI is "
+"required for using the Sympa SOAP server."
msgstr ""
"FastCGI は Apache モジュールで、これを使うことで WWSympa がより速く動作しま"
"す。このオプションは「libapache2-mod-fcgid」パッケージがシステムにインストー"
@@ -202,29 +202,12 @@ msgstr ""
#. Type: boolean
#. Description
#: ../templates:9001
-msgid "Do you want the Web server to be restarted after installation?"
-msgstr "インストール後、ウェブサーバを再起動しますか?"
-
-#. Type: boolean
-#. Description
-#: ../templates:9001
-msgid ""
-"If you don't want the webserver to be restarted, please make sure that "
-"wwsympa and the Sympa SOAP server are not running or the database may "
-"contain duplicates."
-msgstr ""
-"ウェブサーバを再起動させたくない場合は、wwsympa と Sympa SOAP サーバが動作し"
-"ていない、あるいはデータベースが重複を含む可能性があることを承知ください。"
-
-#. Type: boolean
-#. Description
-#: ../templates:10001
msgid "Should the web archives and the bounce directory be removed?"
msgstr "ウェブアーカイブディレクトリとバウンスディレクトリを削除しますか?"
#. Type: boolean
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid ""
"If you used the default configuration, WWSympa web archives are located in /"
"var/lib/sympa/wwsarchive. The WWSympa bounce directory contains bounces (non-"
@@ -237,7 +220,7 @@ msgstr ""
#. Type: boolean
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid ""
"Please choose whether you want to remove the web archives and the bounce "
"directory."
@@ -245,6 +228,18 @@ msgstr ""
"ウェブアーカイブディレクトリとバウンスディレクトリを削除するかどうかを決めて"
"ください。"
+#~ msgid "Do you want the Web server to be restarted after installation?"
+#~ msgstr "インストール後、ウェブサーバを再起動しますか?"
+
+#~ msgid ""
+#~ "If you don't want the webserver to be restarted, please make sure that "
+#~ "wwsympa and the Sympa SOAP server are not running or the database may "
+#~ "contain duplicates."
+#~ msgstr ""
+#~ "ウェブサーバを再起動させたくない場合は、wwsympa と Sympa SOAP サーバが動作"
+#~ "していない、あるいはデータベースが重複を含む可能性があることを承知くださ"
+#~ "い。"
+
#~ msgid "Do you want S/MIME authentication and encryption?"
#~ msgstr "S/MIME 認証および S/MIME 暗号化を利用しますか?"
@@ -306,4 +301,3 @@ msgstr ""
#~ msgstr ""
#~ "一旦インストールされると、WWSympa には以下のアドレスでアクセスできるように"
#~ "なります"
-
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 8a8cbc2..15ef335 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sympa 6.1.7~dfsg-2\n"
"Report-Msgid-Bugs-To: sympa at packages.debian.org\n"
-"POT-Creation-Date: 2010-04-12 15:33+0200\n"
+"POT-Creation-Date: 2013-07-03 19:58+0000\n"
"PO-Revision-Date: 2012-02-22 10:04+0100\n"
"Last-Translator: Jeroen Schot <schot at a-eskwadraat.nl>\n"
"Language-Team: Debian l10n Dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -209,30 +209,12 @@ msgstr ""
#. Type: boolean
#. Description
#: ../templates:9001
-msgid "Do you want the Web server to be restarted after installation?"
-msgstr "Wilt u de webserver na de installatie herstarten?"
-
-#. Type: boolean
-#. Description
-#: ../templates:9001
-msgid ""
-"If you don't want the webserver to be restarted, please make sure that "
-"wwsympa and the Sympa SOAP server are not running or the database may "
-"contain duplicates."
-msgstr ""
-"Als u niet wilt dat de webserver herstart wordt dient u ervoor te zorgen dat "
-"wwsympa en de Sympa SOAP-server niet draaien, en dat de database geen "
-"dubbels bevat."
-
-#. Type: boolean
-#. Description
-#: ../templates:10001
msgid "Should the web archives and the bounce directory be removed?"
msgstr "Wilt u dat de webarchieven en de terugstuurmap verwijderd worden?"
#. Type: boolean
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid ""
"If you used the default configuration, WWSympa web archives are located in /"
"var/lib/sympa/wwsarchive. The WWSympa bounce directory contains bounces (non-"
@@ -245,10 +227,22 @@ msgstr ""
#. Type: boolean
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid ""
"Please choose whether you want to remove the web archives and the bounce "
"directory."
msgstr ""
"Gelieve aan te geven of u wilt dat de webarchieven en de terugstuurmap "
"verwijderd worden."
+
+#~ msgid "Do you want the Web server to be restarted after installation?"
+#~ msgstr "Wilt u de webserver na de installatie herstarten?"
+
+#~ msgid ""
+#~ "If you don't want the webserver to be restarted, please make sure that "
+#~ "wwsympa and the Sympa SOAP server are not running or the database may "
+#~ "contain duplicates."
+#~ msgstr ""
+#~ "Als u niet wilt dat de webserver herstart wordt dient u ervoor te zorgen "
+#~ "dat wwsympa en de Sympa SOAP-server niet draaien, en dat de database geen "
+#~ "dubbels bevat."
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 1d8305a..de94d4d 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sympa\n"
"Report-Msgid-Bugs-To: sympa at packages.debian.org\n"
-"POT-Creation-Date: 2010-04-12 15:33+0200\n"
+"POT-Creation-Date: 2013-07-03 19:58+0000\n"
"PO-Revision-Date: 2010-11-29 08:19+0000\n"
"Last-Translator: Miguel Figueiredo <elmig at debianpt.org>\n"
"Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -165,9 +165,9 @@ msgstr "Quer que o WWSympa corra com FastCGI?"
#: ../templates:7001
msgid ""
"FastCGI is an Apache module that makes WWSympa run much faster. This option "
-"will be activated only if the `libapache2-mod-fcgid' package is installed "
-"on your system. Please first make sure you installed this package. FastCGI "
-"is required for using the Sympa SOAP server."
+"will be activated only if the `libapache2-mod-fcgid' package is installed on "
+"your system. Please first make sure you installed this package. FastCGI is "
+"required for using the Sympa SOAP server."
msgstr ""
"O FastCGI é um módulo do Apache que torna o WWWSympa muito mais rápido. Esta "
"opção será activada apenas se o pacote `libapache2-mod-fcgid' estiver "
@@ -206,30 +206,12 @@ msgstr ""
#. Type: boolean
#. Description
#: ../templates:9001
-msgid "Do you want the Web server to be restarted after installation?"
-msgstr "Quer que o servidor Web seja reiniciado após a instalação?"
-
-#. Type: boolean
-#. Description
-#: ../templates:9001
-msgid ""
-"If you don't want the webserver to be restarted, please make sure that "
-"wwsympa and the Sympa SOAP server are not running or the database may "
-"contain duplicates."
-msgstr ""
-"Se não quiser que o servidor Web seja reiniciado, por favor assegure-se que "
-"o wwsympa e o servidor SOAP do Sympa não estão a correr ou a base de dados "
-"poderá conter duplicados."
-
-#. Type: boolean
-#. Description
-#: ../templates:10001
msgid "Should the web archives and the bounce directory be removed?"
msgstr "Devem os arquivos web e o directório bounce ser removidos ?"
#. Type: boolean
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid ""
"If you used the default configuration, WWSympa web archives are located in /"
"var/lib/sympa/wwsarchive. The WWSympa bounce directory contains bounces (non-"
@@ -242,13 +224,25 @@ msgstr ""
#. Type: boolean
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid ""
"Please choose whether you want to remove the web archives and the bounce "
"directory."
msgstr ""
"Por favor escolha se quer remover os arquivos web e o directório bounce."
+#~ msgid "Do you want the Web server to be restarted after installation?"
+#~ msgstr "Quer que o servidor Web seja reiniciado após a instalação?"
+
+#~ msgid ""
+#~ "If you don't want the webserver to be restarted, please make sure that "
+#~ "wwsympa and the Sympa SOAP server are not running or the database may "
+#~ "contain duplicates."
+#~ msgstr ""
+#~ "Se não quiser que o servidor Web seja reiniciado, por favor assegure-se "
+#~ "que o wwsympa e o servidor SOAP do Sympa não estão a correr ou a base de "
+#~ "dados poderá conter duplicados."
+
#~ msgid "Do you want S/MIME authentication and encryption?"
#~ msgstr "Deseja autenticação e encriptação S/MIME?"
diff --git a/debian/po/pt_BR.po b/debian/po/pt_BR.po
index 62f9911..0bef9b3 100644
--- a/debian/po/pt_BR.po
+++ b/debian/po/pt_BR.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sympa\n"
"Report-Msgid-Bugs-To: sympa at packages.debian.org\n"
-"POT-Creation-Date: 2010-04-12 15:33+0200\n"
+"POT-Creation-Date: 2013-07-03 19:58+0000\n"
"PO-Revision-Date: 2011-03-24 22:42-0300\n"
"Last-Translator: Eder L. Marques <eder at edermarques.net>\n"
"Language-Team: Brazilian Portuguese <debian-l10n-portuguese at lists.debian."
@@ -170,9 +170,9 @@ msgstr "Você deseja que o WWSympa seja executado com o FastCGI?"
#: ../templates:7001
msgid ""
"FastCGI is an Apache module that makes WWSympa run much faster. This option "
-"will be activated only if the `libapache2-mod-fcgid' package is installed "
-"on your system. Please first make sure you installed this package. FastCGI "
-"is required for using the Sympa SOAP server."
+"will be activated only if the `libapache2-mod-fcgid' package is installed on "
+"your system. Please first make sure you installed this package. FastCGI is "
+"required for using the Sympa SOAP server."
msgstr ""
"O FastCGI é um módulo do Apache que faz com que o WWSympa seja executado "
"muito mais rápido. Essa opção será ativada somente caso o pacote 'libapache2-"
@@ -212,30 +212,12 @@ msgstr ""
#. Type: boolean
#. Description
#: ../templates:9001
-msgid "Do you want the Web server to be restarted after installation?"
-msgstr "Você deseja que o servidor Web seja reiniciado depois da instalação?"
-
-#. Type: boolean
-#. Description
-#: ../templates:9001
-msgid ""
-"If you don't want the webserver to be restarted, please make sure that "
-"wwsympa and the Sympa SOAP server are not running or the database may "
-"contain duplicates."
-msgstr ""
-"Se você não quer que o servidor web seja reiniciado, por favor, tenha "
-"certeza de que o wwsympa e o servidor SOAP do Sympa não estejam em execução "
-"ou o banco de dados pode conter dados duplicados."
-
-#. Type: boolean
-#. Description
-#: ../templates:10001
msgid "Should the web archives and the bounce directory be removed?"
msgstr "Os arquivos web e o diretório de bounces devem ser removidos?"
#. Type: boolean
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid ""
"If you used the default configuration, WWSympa web archives are located in /"
"var/lib/sympa/wwsarchive. The WWSympa bounce directory contains bounces (non-"
@@ -248,7 +230,7 @@ msgstr ""
#. Type: boolean
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid ""
"Please choose whether you want to remove the web archives and the bounce "
"directory."
@@ -256,6 +238,19 @@ msgstr ""
"Por favor, escolha se você deseja remover os arquivos web e o diretório de "
"bounces."
+#~ msgid "Do you want the Web server to be restarted after installation?"
+#~ msgstr ""
+#~ "Você deseja que o servidor Web seja reiniciado depois da instalação?"
+
+#~ msgid ""
+#~ "If you don't want the webserver to be restarted, please make sure that "
+#~ "wwsympa and the Sympa SOAP server are not running or the database may "
+#~ "contain duplicates."
+#~ msgstr ""
+#~ "Se você não quer que o servidor web seja reiniciado, por favor, tenha "
+#~ "certeza de que o wwsympa e o servidor SOAP do Sympa não estejam em "
+#~ "execução ou o banco de dados pode conter dados duplicados."
+
#~ msgid "Do you want S/MIME authentication and encryption?"
#~ msgstr "Você deseja autenticação S/MIME e criptografia?"
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 82f1f62..6f3fc44 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sympa 5.3.4-5.1\n"
"Report-Msgid-Bugs-To: sympa at packages.debian.org\n"
-"POT-Creation-Date: 2010-04-12 15:33+0200\n"
+"POT-Creation-Date: 2013-07-03 19:58+0000\n"
"PO-Revision-Date: 2010-05-01 10:30+0400\n"
"Last-Translator: Yuri Kozlov <yuray at komyakino.ru>\n"
"Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -167,9 +167,9 @@ msgstr "Запускать WWSympa с помощью FastCGI?"
#: ../templates:7001
msgid ""
"FastCGI is an Apache module that makes WWSympa run much faster. This option "
-"will be activated only if the `libapache2-mod-fcgid' package is installed "
-"on your system. Please first make sure you installed this package. FastCGI "
-"is required for using the Sympa SOAP server."
+"will be activated only if the `libapache2-mod-fcgid' package is installed on "
+"your system. Please first make sure you installed this package. FastCGI is "
+"required for using the Sympa SOAP server."
msgstr ""
"FastCGI -- это модуль Apache, который позволяет WWSympa работать намного "
"быстрее. Эта опция будет активна только если в вашей системе установлен "
@@ -207,30 +207,12 @@ msgstr ""
#. Type: boolean
#. Description
#: ../templates:9001
-msgid "Do you want the Web server to be restarted after installation?"
-msgstr "Перезапустить веб-сервер после установки?"
-
-#. Type: boolean
-#. Description
-#: ../templates:9001
-msgid ""
-"If you don't want the webserver to be restarted, please make sure that "
-"wwsympa and the Sympa SOAP server are not running or the database may "
-"contain duplicates."
-msgstr ""
-"Если вы не хотите перезапускать веб-сервер, то убедитесь, что wwsympa и "
-"Sympa SOAP сервер не запущены, иначе база данных может содержать "
-"дублирующиеся записи."
-
-#. Type: boolean
-#. Description
-#: ../templates:10001
msgid "Should the web archives and the bounce directory be removed?"
msgstr "Удалить веб-архивы и каталог обратных ответов?"
#. Type: boolean
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid ""
"If you used the default configuration, WWSympa web archives are located in /"
"var/lib/sympa/wwsarchive. The WWSympa bounce directory contains bounces (non-"
@@ -243,10 +225,22 @@ msgstr ""
#. Type: boolean
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid ""
"Please choose whether you want to remove the web archives and the bounce "
"directory."
msgstr ""
"Ответьте утвердительно, если хотите удалить веб-архивы и каталог обратных "
"ответов."
+
+#~ msgid "Do you want the Web server to be restarted after installation?"
+#~ msgstr "Перезапустить веб-сервер после установки?"
+
+#~ msgid ""
+#~ "If you don't want the webserver to be restarted, please make sure that "
+#~ "wwsympa and the Sympa SOAP server are not running or the database may "
+#~ "contain duplicates."
+#~ msgstr ""
+#~ "Если вы не хотите перезапускать веб-сервер, то убедитесь, что wwsympa и "
+#~ "Sympa SOAP сервер не запущены, иначе база данных может содержать "
+#~ "дублирующиеся записи."
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 727a28e..4034fed 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sympa\n"
"Report-Msgid-Bugs-To: sympa at packages.debian.org\n"
-"POT-Creation-Date: 2010-04-12 15:33+0200\n"
+"POT-Creation-Date: 2013-07-03 19:58+0000\n"
"PO-Revision-Date: 2010-06-22 22:41+0100\n"
"Last-Translator: Martin Bagge <brother at bsnet.se>\n"
"Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
@@ -163,9 +163,9 @@ msgstr "Vill du att WWSympa ska köra med FastCGI?"
#: ../templates:7001
msgid ""
"FastCGI is an Apache module that makes WWSympa run much faster. This option "
-"will be activated only if the `libapache2-mod-fcgid' package is installed "
-"on your system. Please first make sure you installed this package. FastCGI "
-"is required for using the Sympa SOAP server."
+"will be activated only if the `libapache2-mod-fcgid' package is installed on "
+"your system. Please first make sure you installed this package. FastCGI is "
+"required for using the Sympa SOAP server."
msgstr ""
"FastCGI är en Apache-modul som gör att WWSympa kör mycket snabbare. Detta "
"alternativ kommer att bli aktivt endast om paketet \"libapache2-mod-fcgid\" "
@@ -203,29 +203,12 @@ msgstr ""
#. Type: boolean
#. Description
#: ../templates:9001
-msgid "Do you want the Web server to be restarted after installation?"
-msgstr "Vill du att webbservern ska startas om efter installationen?"
-
-#. Type: boolean
-#. Description
-#: ../templates:9001
-msgid ""
-"If you don't want the webserver to be restarted, please make sure that "
-"wwsympa and the Sympa SOAP server are not running or the database may "
-"contain duplicates."
-msgstr ""
-"Om du inte vill att webbservern ska startas om, kontrollera att wwsympa och "
-"Sympas SOAP-server inte kör eller att databasen innehåller dubletter."
-
-#. Type: boolean
-#. Description
-#: ../templates:10001
msgid "Should the web archives and the bounce directory be removed?"
msgstr "Ska webbarkiven och studskatalogen tas bort?"
#. Type: boolean
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid ""
"If you used the default configuration, WWSympa web archives are located in /"
"var/lib/sympa/wwsarchive. The WWSympa bounce directory contains bounces (non-"
@@ -238,12 +221,23 @@ msgstr ""
#. Type: boolean
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid ""
"Please choose whether you want to remove the web archives and the bounce "
"directory."
msgstr "Välj huruvida du vill ta bort webbarkiven och studskatalogen."
+#~ msgid "Do you want the Web server to be restarted after installation?"
+#~ msgstr "Vill du att webbservern ska startas om efter installationen?"
+
+#~ msgid ""
+#~ "If you don't want the webserver to be restarted, please make sure that "
+#~ "wwsympa and the Sympa SOAP server are not running or the database may "
+#~ "contain duplicates."
+#~ msgstr ""
+#~ "Om du inte vill att webbservern ska startas om, kontrollera att wwsympa "
+#~ "och Sympas SOAP-server inte kör eller att databasen innehåller dubletter."
+
#~ msgid "Do you want S/MIME authentication and encryption?"
#~ msgstr "Vill du använda S/MIME-autentisering och kryptering?"
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 64b5560..08f5cdf 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: sympa\n"
"Report-Msgid-Bugs-To: sympa at packages.debian.org\n"
-"POT-Creation-Date: 2011-11-27 16:44+0000\n"
+"POT-Creation-Date: 2013-07-03 19:58+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -184,27 +184,12 @@ msgstr ""
#. Type: boolean
#. Description
#: ../templates:9001
-msgid "Do you want the Web server to be restarted after installation?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:9001
-msgid ""
-"If you don't want the webserver to be restarted, please make sure that "
-"wwsympa and the Sympa SOAP server are not running or the database may "
-"contain duplicates."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:10001
msgid "Should the web archives and the bounce directory be removed?"
msgstr ""
#. Type: boolean
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid ""
"If you used the default configuration, WWSympa web archives are located in /"
"var/lib/sympa/wwsarchive. The WWSympa bounce directory contains bounces (non-"
@@ -213,7 +198,7 @@ msgstr ""
#. Type: boolean
#. Description
-#: ../templates:10001
+#: ../templates:9001
msgid ""
"Please choose whether you want to remove the web archives and the bounce "
"directory."
diff --git a/debian/sympa.dirs b/debian/sympa.dirs
index 1b260c3..ab11cbe 100644
--- a/debian/sympa.dirs
+++ b/debian/sympa.dirs
@@ -1,4 +1,5 @@
etc/mail
+etc/apache2/conf-available
etc/rsyslog.d
usr/share/doc/sympa/examples/script
var/lib/sympa/list_data/X509-user-certs
diff --git a/debian/sympa.install b/debian/sympa.install
index 4d37d85..4cac3ad 100644
--- a/debian/sympa.install
+++ b/debian/sympa.install
@@ -1,11 +1,10 @@
debian/conf/rsyslog/sympa.conf etc/rsyslog.d
-debian/conf/apache etc/sympa
-debian/conf/apache-soap etc/sympa
+debian/conf/apache2/sympa.conf etc/apache2/conf-available
+debian/conf/apache2/sympa-soap.conf etc/apache2/conf-available
debian/conf/auth.conf etc/sympa
-debian/conf/httpd.conf* etc/sympa
debian/conf/sympa.conf-smime.in etc/sympa
-debian/conf/sympa.conf usr/share/doc/sympa/examples/config
debian/conf/topics.conf etc/sympa
+debian/conf/sympa.conf usr/share/doc/sympa/examples/config
debian/conf/topics.conf usr/share/doc/sympa/examples/config
debian/conf/wwsympa.conf usr/share/doc/sympa/examples/config
src/etc/script/create_db.* usr/share/doc/sympa/examples/db
diff --git a/debian/sympa.links b/debian/sympa.links
index 8e1cce2..3b69a00 100644
--- a/debian/sympa.links
+++ b/debian/sympa.links
@@ -1,4 +1,3 @@
-/etc/sympa/apache /etc/apache2/conf.d/sympa
/usr/lib/sympa/bin/alias_manager.pl /usr/bin/alias_manager
/usr/lib/sympa/bin/archived.pl /usr/bin/archived
/usr/lib/sympa/bin/bounced.pl /usr/bin/bounced
diff --git a/debian/sympa.lintian-overrides b/debian/sympa.lintian-overrides
index b3b6010..31a2595 100644
--- a/debian/sympa.lintian-overrides
+++ b/debian/sympa.lintian-overrides
@@ -1,2 +1,2 @@
-sympa: possible-bashism-in-maintainer-script postinst:271 '(type '
+sympa: possible-bashism-in-maintainer-script postinst:280 '(type '
sympa: package-contains-broken-symlink usr/share/sympa/default/ca-bundle.crt etc/ssl/certs/ca-certificates.crt
diff --git a/debian/sympa.postinst b/debian/sympa.postinst
index bd31eb1..e266d84 100644
--- a/debian/sympa.postinst
+++ b/debian/sympa.postinst
@@ -49,6 +49,14 @@ if [ ! -f /etc/sympa/data_structure.version ]; then
fi
chown sympa:sympa /etc/sympa/data_structure.version
+# Remove conffiles used by apache2 < 2.4
+if which dpkg-maintscript-helper >/dev/null && dpkg-maintscript-helper supports rm_conffile ; then
+ for i in apache apache-soap httpd.conf-cgi httpd.conf-fcgi ; do
+ dpkg-maintscript-helper rm_conffile "/etc/sympa/${i}" \
+ "6.1.17~dfsg-1~" -- "$@"
+ done
+fi
+
# Stop the daemon if it has already been started This is necessary when you run
# dpkg-reconfigure
if [ "$1" = "configure" ]; then
@@ -65,8 +73,9 @@ fi
if [ -f "$conf" ]; then
# Replace/disable obsolete settings in configuration file
perl -i -pe 's%^\s*msgcat(.*)%localedir /usr/lib/sympa/locale%; s%(\s*queueexpire.*)%# $1%;' "$conf"
+ perl -i -pe 's%^\s*(dkim_header_list.*)$%#$1%;' "$conf"
else
- # Create congfiguration file
+ # Create congfiguration file
/usr/lib/sympa/bin/sympa_wizard.pl --create sympa.conf --target "$conf"
perl -i -pe 's%^#?(cookie\s+).*%cookie `cat /etc/sympa/cookie`%; s%^(syslog\s+).*%syslog `cat /etc/sympa/facility`%;' "$conf"
fi
@@ -183,10 +192,10 @@ done
## Setup a syslog facility
if which syslog-facility >/dev/null 2>&1 \
- && [ -e /etc/syslog.conf ] \
- && ! grep -q "/var/log/sympa.log" /etc/syslog.conf \
- && syslog-facility set all /var/log/sympa.log > /etc/sympa/facility \
- && [ -x /etc/init.d/sysklogd ]; then
+ && [ -e /etc/syslog.conf ] \
+ && ! grep -q "/var/log/sympa.log" /etc/syslog.conf \
+ && syslog-facility set all /var/log/sympa.log > /etc/sympa/facility \
+ && [ -x /etc/init.d/sysklogd ]; then
if which invoke-rc.d >/dev/null 2>&1; then
invoke-rc.d sysklogd reload
else
@@ -195,7 +204,7 @@ if which syslog-facility >/dev/null 2>&1 \
fi
## ...and ensure existence and access rights of facility file even if unused
if [ ! -e /etc/sympa/facility ]; then
- touch /etc/sympa/facility
+ touch /etc/sympa/facility
fi
chown sympa:sympa /etc/sympa/facility
@@ -334,12 +343,12 @@ db_get wwsympa/webserver_type
webserver="$RET"
case $webserver in
- "Apache 2")
- webserver="apache2"
- ;;
- *)
- webserver="none"
- ;;
+ "Apache 2")
+ webserver="apache2"
+ ;;
+ *)
+ webserver="none"
+ ;;
esac
# Check whether the Web server is installed
@@ -381,56 +390,49 @@ if [ "$use_soap" = "true" ]; then
fi
fi
+# Cleanup sympa configuration files used by Apache2 << 2.4
+for suffix in '' '-soap' ; do
+ if [ -h "/etc/apache2/conf.d/sympa${suffix}" ] && \
+ [ "$(readlink -f "/etc/apache2/conf.d/sympa${suffix}")" = "/etc/sympa/apache${suffix}" ]; then
+ rm -f "/etc/apache2/conf.d/sympa${suffix}"
+ fi
+done
+
# WebServer configuration
db_get wwsympa/webserver_type
webserver="$RET"
-case $webserver in
- "Apache 2")
- webserver="apache2"
- ;;
- *)
- webserver="none"
- ;;
-esac
-
-# Check whether the Web server is installed
-if [ -f /etc/$webserver/httpd.conf ]; then
- echo "$webserver: installation seems OK ..."
-else
- webserver="none"
-fi
-
-if [ $webserver = "none" ]; then
- echo "Not configuring Web server."
-else
- mkdir -p /etc/$webserver/conf.d
-
- # Activate wwsympa
- if [ ! -f /etc/$webserver/conf.d/sympa ] && [ ! -h /etc/$webserver/conf.d/sympa ]; then
- ln -sf /etc/sympa/apache-wwsympa /etc/$webserver/conf.d/sympa
- fi
-
- if [ "$use_soap" = "true" ]; then
- # Activate soap
- if [ ! -f /etc/$webserver/conf.d/sympa-soap ] && [ ! -h /etc/$webserver/conf.d/sympa-soap ]; then
- ln -s /etc/sympa/apache-soap /etc/$webserver/conf.d/sympa-soap
- fi
- fi
-fi
-
-# Check whether we have to restart the Web server
-db_get wwsympa/webserver_restart
-restart="$RET"
-
-if [ "$restart" = "true" ]; then
- if [ -x /etc/init.d/$webserver ]; then
- if which invoke-rc.d >/dev/null 2>&1; then
- invoke-rc.d $webserver force-reload
+if [ "$webserver" = "Apache 2" ]; then
+ if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+ # Apache2 >= 2.4
+ . /usr/share/apache2/apache2-maintscript-helper
+ apache2_invoke enconf sympa.conf
+ if [ "$use_soap" = "true" ]; then
+ apache2_invoke enconf sympa-soap.conf
else
- etc/init.d/$webserver force-reload
+ #apache2_invoke disconf sympa-soap.conf
+ #
+ # FIXME: Workaround disconf no (yet?) supported in postinst
+ #
+ rm -f /etc/apache2/conf-enabled/sympa-soap.conf
+ export APACHE2_NEED_ACTION=1
+ apache2_reload reload
fi
fi
+else
+ if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+ # Apache2 >= 2.4
+ . /usr/share/apache2/apache2-maintscript-helper
+ #apache2_invoke disconf sympa.conf
+ #apache2_invoke disconf sympa-soap.conf
+ #
+ # FIXME: Workaround disconf no (yet?) supported in postinst
+ #
+ rm -f /etc/apache2/conf-enabled/sympa.conf
+ rm -f /etc/apache2/conf-enabled/sympa-soap.conf
+ export APACHE2_NEED_ACTION=1
+ apache2_reload reload
+ fi
fi
su -l sympa -s /bin/sh -c "/usr/lib/sympa/bin/sympa.pl --upgrade"
diff --git a/debian/sympa.postrm b/debian/sympa.postrm
index 77ecffa..da4efc8 100644
--- a/debian/sympa.postrm
+++ b/debian/sympa.postrm
@@ -11,120 +11,88 @@ if [ -f /usr/share/dbconfig-common/dpkg/postrm ]; then
dbc_go sympa $@
fi
-case "$1" in
- remove)
- db_get sympa/use_soap || true
- use_soap="$RET"
-
- # Check whether the syslog configuration file is present in case
- # another system log daemon is used instead of syslog
- if [ -f /etc/sympa/facility ]; then
- if perl -ne '/(\S+)/ || exit 1; $ENV{facility}=$1; exit' /etc/sympa/facility \
- && which syslog-facility >/dev/null 2>&1 \
- && [ -e /etc/syslog.conf ] \
- && syslog-facility remove "$facility" \
- && [ -x /etc/init.d/sysklogd ]; then
- if which invoke-rc.d >/dev/null 2>&1; then
- invoke-rc.d sysklogd reload
- else
- etc/init.d/sysklogd reload
- fi
- fi
- rm -f /etc/sympa/facility
- fi
-
- if [ "$use_soap" = "true" ]; then
- # Remove Web server configuration
- db_get wwsympa/webserver_type
- webserver="$RET"
-
- case $webserver in
- "Apache 2")
- webserver="apache2"
- ;;
- *)
- webserver="none"
- ;;
- esac
-
- if [ "$use_soap" = "true" ]; then
- # Remove symbolic link to webserver configuration snippet
- link=$(readlink /etc/$webserver/conf.d/sympa-soap || true)
- if [ "$link" = "/etc/sympa/apache-soap" ]; then
- rm -f /etc/$webserver/conf.d/sympa-soap
- fi
- fi
+# Remove conffiles used by apache2 < 2.4
+if which dpkg-maintscript-helper >/dev/null && dpkg-maintscript-helper supports rm_conffile ; then
+ for i in apache apache-soap httpd.conf-cgi httpd.conf-fcgi ; do
+ dpkg-maintscript-helper rm_conffile "/etc/sympa/${i}" \
+ "6.1.17~dfsg-1~" -- "$@"
+ done
+fi
- if [ $webserver != "none" ]; then
- # Restarting web server if it was requested at configuration time.
- db_get wwsympa/webserver_restart
- restart="$RET"
-
- if [ "$restart" = "true" ]; then
- if [ -x /etc/init.d/$webserver ]; then
- if which invoke-rc.d >/dev/null 2>&1; then
- invoke-rc.d $webserver force-reload
- else
- etc/init.d/$webserver force-reload
- fi
- fi
- # End up with debconf
- db_stop
- fi
+if [ "$1" = "remove" ]; then
+ # Check whether the syslog configuration file is present in case
+ # another system log daemon is used instead of syslog
+ if [ -f /etc/sympa/facility ]; then
+ if perl -ne '/(\S+)/ || exit 1; $ENV{facility}=$1; exit' /etc/sympa/facility \
+ && which syslog-facility >/dev/null 2>&1 \
+ && [ -e /etc/syslog.conf ] \
+ && syslog-facility remove "$facility" \
+ && [ -x /etc/init.d/sysklogd ]; then
+ if which invoke-rc.d >/dev/null 2>&1; then
+ invoke-rc.d sysklogd reload
+ else
+ etc/init.d/sysklogd reload
fi
fi
- ;;
-
- purge)
- db_input high wwsympa/remove_spool || true
- db_go
- db_get wwsympa/remove_spool
- remove_archives="$RET"
-
- if [ "$remove_archives" = "true" ]; then
- echo ""
- echo "Removing archives and spool subdirectories as requested ..."
- rm -rf /var/lib/sympa/wwsarchive 2>/dev/null || true
- rm -rf /var/spool/sympa/wws* 2>/dev/null || true
- fi
-
- # Delete the log files if purging, remove aliases too.
- rm -f /var/log/sympa.log*
-
- # Remove static content directory
- if [ -d /var/lib/sympa/static_content ]; then
- rm -r /var/lib/sympa/static_content
- fi
-
- if [ -f /etc/aliases ]; then
- sed -i -e '/#-- SYMPA begin/,/#-- SYMPA end/d' /etc/aliases
- newaliases || true
- fi
-
- rm -f /etc/sympa/cookie 2>/dev/null || true
- rm -f /etc/sympa/cookies.history
-
- # Remove configuration files
- rm -f /etc/sympa/data_structure.version
- rm -f /etc/sympa/data_structure.version.debian-old
- rm -f /etc/sympa/sympa.conf
- rm -f /etc/sympa/wwsympa.conf
-
- # Try to remove if empty
- rmdir /etc/sympa 2>/dev/null || true
-
- db_input high sympa/remove_spool || true
- db_go
- db_get sympa/remove_spool
- remove_spool="$RET"
+ rm -f /etc/sympa/facility
+ fi
+ if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+ # Apache2 >= 2.4
+ . /usr/share/apache2/apache2-maintscript-helper
+ apache2_invoke disconf sympa.conf
+ apache2_invoke disconf sympa-soap.conf
+ fi
+fi
- if [ "$remove_spool" = "true" ]; then
- echo ""
- echo "Removing lists data and spool directory as requested ..."
- rm -rf /var/lib/sympa 2>/dev/null || true
- rm -rf /var/spool/sympa 2>/dev/null || true
- fi
- ;;
-esac
+if [ "$1" = "purge" ]; then
+ db_input high wwsympa/remove_spool || true
+ db_go
+ db_get wwsympa/remove_spool
+ remove_archives="$RET"
+
+ if [ "$remove_archives" = "true" ]; then
+ echo "Removing archives and spool subdirectories as requested..."
+ rm -rf /var/lib/sympa/wwsarchive 2>/dev/null || true
+ rm -rf /var/spool/sympa/wws* 2>/dev/null || true
+ fi
+
+ # Delete the log files if purging, remove aliases too.
+ rm -f /var/log/sympa.log*
+
+ # Remove static content directory
+ if [ -d /var/lib/sympa/static_content ]; then
+ rm -r /var/lib/sympa/static_content
+ fi
+
+ if [ -f /etc/aliases ]; then
+ sed -i -e '/#-- SYMPA begin/,/#-- SYMPA end/d' /etc/aliases
+ newaliases || true
+ fi
+
+ rm -f /etc/sympa/cookie 2>/dev/null || true
+ rm -f /etc/sympa/cookies.history
+
+ # Remove configuration files
+ rm -f /etc/sympa/data_structure.version
+ rm -f /etc/sympa/data_structure.version.debian-old
+ rm -f /etc/sympa/sympa.conf
+ rm -f /etc/sympa/wwsympa.conf
+
+ # Try to remove if empty
+ rmdir /etc/sympa 2>/dev/null || true
+
+ db_input high sympa/remove_spool || true
+ db_go
+ db_get sympa/remove_spool
+ remove_spool="$RET"
+
+ if [ "$remove_spool" = "true" ]; then
+ echo "Removing lists data and spool directory as requested..."
+ rm -rf /var/lib/sympa 2>/dev/null || true
+ rm -rf /var/spool/sympa 2>/dev/null || true
+ fi
+fi
#DEBHELPER#
+
+exit 0
diff --git a/debian/sympa.preinst b/debian/sympa.preinst
index e2bf5de..16b19be 100644
--- a/debian/sympa.preinst
+++ b/debian/sympa.preinst
@@ -28,7 +28,13 @@ if which dpkg-maintscript-helper >/dev/null && dpkg-maintscript-helper supports
"6.1.11~dfsg-1~" -- "$@"
fi
-
+# Remove conffiles used by apache2 < 2.4
+if which dpkg-maintscript-helper >/dev/null && dpkg-maintscript-helper supports rm_conffile ; then
+ for i in apache apache-soap httpd.conf-cgi httpd.conf-fcgi ; do
+ dpkg-maintscript-helper rm_conffile "/etc/sympa/${i}" \
+ "6.1.17~dfsg-1~" -- "$@"
+ done
+fi
#DEBHELPER#
diff --git a/debian/templates b/debian/templates
index b0841ce..4683a93 100644
--- a/debian/templates
+++ b/debian/templates
@@ -73,13 +73,6 @@ _Description: Do you want the sympa SOAP server to be used?
.
The SOAP server uses libsoap-lite-perl package and a webserver like apache.
-Template: wwsympa/webserver_restart
-Type: boolean
-Default: true
-_Description: Do you want the Web server to be restarted after installation?
- If you don't want the webserver to be restarted, please make sure that wwsympa
- and the Sympa SOAP server are not running or the database may contain duplicates.
-
Template: wwsympa/remove_spool
Type: boolean
Default: false
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/sympa.git
More information about the Pkg-sympa-commits
mailing list