diff --git a/debian/README.Debian b/debian/README.Debian index 9817bdbc..10ba713f 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -6,17 +6,6 @@ http://youserver/postfixadmin/setup.php works. This should guide you through the appropriate process. -Integration with Postfix, Dovecot etc. -====================================== - -Now that PostfixAdmin is working, you need to do some configuration -in Postfix, Dovecot etc. so that they use the domains, mailboxes and -aliases you setup in PostfixAdmin. - -The files in /usr/share/doc/postfixadmin/ directory explain which -settings you need to do/change. - - Recommended and Suggested Packages ================================== - Postfix diff --git a/debian/apache.conf b/debian/apache/postfixadmin.conf similarity index 100% rename from debian/apache.conf rename to debian/apache/postfixadmin.conf diff --git a/debian/changelog b/debian/changelog index 91a0b9c3..c182dfdf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +postfixadmin (2.93-2) unstable; urgency=low + + * Replace debian/ using Debian v2.3.7-2. See Debian's #821643 + * This adds : PHP7 and Apache 2.4 support. + + -- David Goodwin Sun, 22 May 2016 19:41:01 +0100 + postfixadmin (2.93-1) unstable; urgency=low * New upstream release (effectively beta3 for v3.0) diff --git a/debian/control b/debian/control index cbb5918e..9a0d84c3 100644 --- a/debian/control +++ b/debian/control @@ -2,23 +2,23 @@ Source: postfixadmin Section: admin Priority: optional Maintainer: Norman Messtorff -Build-Depends: debhelper (>= 7), po-debconf -Standards-Version: 3.9.3 -XS-Vcs-Svn: https://postfixadmin.svn.sourceforge.net/svnroot/postfixadmin/trunk -XS-Vcs-Browser: https://postfixadmin.svn.sourceforge.net/svnroot/postfixadmin/trunk +Uploaders: Gaudenz Steinlin , Christoph Martin +Build-Depends: debhelper (>= 7), po-debconf, dh-apache2 +Standards-Version: 3.9.5 +Vcs-Git: git://anonscm.debian.org/collab-maint/postfixadmin.git +Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/postfixadmin.git Homepage: http://postfixadmin.sourceforge.net Package: postfixadmin Architecture: all -Depends: debconf (>= 0.5), dbconfig-common, wwwconfig-common, apache2 | lighttpd | httpd, libapache2-mod-php5 | php5-cgi | php5, php5-cli, php5-imap, php5-mysql | php5-mysqlnd | php5-pgsql, mysql-client | postgresql-client | mariadb-client, ${misc:Depends} -Recommends: postfix-mysql | postfix-pgsql, mysql-server | postgresql-server | mariadb-server -Suggests: dovecot-common | courier-authlib-mysql | courier-authlib-postgresql +Depends: debconf (>= 0.5), dbconfig-common, wwwconfig-common, apache2 | lighttpd | httpd, libapache2-mod-php | php-cgi | php, php-imap, php-mysql | php-pgsql, mysql-client | postgresql-client, ${misc:Depends} +Recommends: postfix-mysql | postfix-pgsql, mysql-server | postgresql, zendframework, dovecot-core | courier-authlib-mysql | courier-authlib-postgresql Description: Virtual mail hosting interface for Postfix Postfixadmin is a web interface to manage virtual users and domains - for a Postfix mail transport agent. It supports Virtual mailboxes, + for a Postfix mail transport agent. It supports Virtual mailboxes, aliases, forwarders and vacation. . - Postfixadmin allows administrators to delegate account handling + Postfixadmin allows administrators to delegate account handling to domain administrators and allows users to login and change their own settings (e.g. forwarders, vacation, passwords etc). . diff --git a/debian/lighttpd.conf b/debian/lighttpd/90-postfixadmin.conf similarity index 100% rename from debian/lighttpd.conf rename to debian/lighttpd/90-postfixadmin.conf diff --git a/debian/patches/db_credentials b/debian/patches/0001-db_credentials.patch similarity index 61% rename from debian/patches/db_credentials rename to debian/patches/0001-db_credentials.patch index 831f3345..667462d9 100644 --- a/debian/patches/db_credentials +++ b/debian/patches/0001-db_credentials.patch @@ -1,25 +1,28 @@ -Description: This patch sets the dbconfig placeholders in config.inc.php. -Forwarded: not-needed -Author: Norman Messtorff -Last-Update: 2012-05-28 +From: Norman Messtorff +Date: Sun, 23 Mar 2014 17:40:30 +0100 +Subject: db_credentials -Index: postfixadmin/config.inc.php -=================================================================== ---- postfixadmin.orig/config.inc.php 2015-09-26 15:03:05.000000000 +0100 -+++ postfixadmin/config.inc.php 2015-09-26 15:03:16.000000000 +0100 -@@ -15,6 +15,11 @@ +--- + config.inc.php | 19 ++++++++++++------- + 1 file changed, 12 insertions(+), 7 deletions(-) + +diff --git a/config.inc.php b/config.inc.php +index e41e7c3..538446d 100644 +--- a/config.inc.php ++++ b/config.inc.php +@@ -16,6 +16,11 @@ * Contains configuration options. */ +// This loads the automatic generated DB credentials from /etc/postfixadmin/dbconfig.inc.php -+require_once('/etc/postfixadmin/dbconfig.inc.php'); ++require_once('dbconfig.inc.php'); +if (!isset($dbserver) || empty($dbserver)) + $dbserver='localhost'; + /***************************************************************** * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! * You have to set $CONF['configured'] = true; before the -@@ -22,7 +27,7 @@ +@@ -23,7 +28,7 @@ * Doing this implies you have changed this file as required. * i.e. configuring database etc; specifying setup.php password etc. */ @@ -28,11 +31,20 @@ Index: postfixadmin/config.inc.php // In order to setup Postfixadmin, you MUST specify a hashed password here. // To create the hash, visit setup.php in a browser and type a password into the field, -@@ -80,11 +85,11 @@ +@@ -33,7 +38,7 @@ $CONF['setup_password'] = 'changeme'; + // Postfix Admin Path + // Set the location of your Postfix Admin installation here. + // YOU MUST ENTER THE COMPLETE URL e.g. http://domain.tld/postfixadmin +-$CONF['postfix_admin_url'] = ''; ++$CONF['postfix_admin_url'] = '/postfixadmin'; + + // shouldn't need changing. + $CONF['postfix_admin_path'] = dirname(__FILE__); +@@ -46,11 +51,11 @@ $CONF['default_language'] = 'en'; // mysql = MySQL 3.23 and 4.0, 4.1 or 5 - // mysqli = MySQL 4.1+ or MariaDB + // mysqli = MySQL 4.1+ // pgsql = PostgreSQL --$CONF['database_type'] = 'mysqli'; +-$CONF['database_type'] = 'mysql'; -$CONF['database_host'] = 'localhost'; -$CONF['database_user'] = 'postfix'; -$CONF['database_password'] = 'postfixadmin'; diff --git a/debian/patches/0002-dovecotpw.patch b/debian/patches/0002-dovecotpw.patch new file mode 100644 index 00000000..bc72fbd7 --- /dev/null +++ b/debian/patches/0002-dovecotpw.patch @@ -0,0 +1,21 @@ +Description: Use doveadm pw instead of dovecotpw by default + Newer versions of dovecot no longer have the dovecotpw command. +Author: Gaudenz Steinlin +Forwarded: not-needed +Applied-Upstream: fixed upstream in version 2.91 +Last-Update: 2014-10-03 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: postfixadmin/config.inc.php +=================================================================== +--- postfixadmin.orig/config.inc.php 2014-10-02 17:21:08.000000000 +0200 ++++ postfixadmin/config.inc.php 2014-10-03 10:40:32.836919086 +0200 +@@ -111,7 +111,7 @@ + $CONF['authlib_default_flavor'] = 'md5raw'; + + // If you use the dovecot encryption method: where is the dovecotpw binary located? +-$CONF['dovecotpw'] = "/usr/sbin/dovecotpw"; ++$CONF['dovecotpw'] = "/usr/bin/doveadm pw"; + + // Minimum length required for passwords. Postfixadmin will not + // allow users to set passwords which are shorter than this value. diff --git a/debian/patches/series b/debian/patches/series index 96306ea7..972e790b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ -db_credentials +0001-db_credentials.patch +0002-dovecotpw.patch diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in deleted file mode 100644 index cef83a34..00000000 --- a/debian/po/POTFILES.in +++ /dev/null @@ -1 +0,0 @@ -[type: gettext/rfc822deb] templates diff --git a/debian/po/cs.po b/debian/po/cs.po deleted file mode 100644 index a8ac8a45..00000000 --- a/debian/po/cs.po +++ /dev/null @@ -1,32 +0,0 @@ -# Czech PO debconf template translation of postfixadmin. -# Copyright (C) 2012 Michal Simunek -# This file is distributed under the same license as the postfixadmin package. -# Michal Simunek , 2012. -# -msgid "" -msgstr "" -"Project-Id-Version: postfixadmin 2.3.5-1\n" -"Report-Msgid-Bugs-To: postfixadmin@packages.debian.org\n" -"POT-Creation-Date: 2008-10-27 22:14+0100\n" -"PO-Revision-Date: 2012-04-13 18:31+0200\n" -"Last-Translator: Michal Simunek \n" -"Language-Team: Czech \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "Web server to reconfigure automatically:" -msgstr "Automaticky přenastavit webový server:" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "" -"Please choose the web server that should be automatically configured to run " -"postfixadmin." -msgstr "" -"Zvolte si prosím webový server, který se má automaticky nastavit ke " -"spuštění postfixadmin." diff --git a/debian/po/da.po b/debian/po/da.po deleted file mode 100644 index 7bc115f0..00000000 --- a/debian/po/da.po +++ /dev/null @@ -1,34 +0,0 @@ -# Danish translation postfixadmin. -# Copyright (C) 2012 postfixadmin & nedenstående oversættere. -# This file is distributed under the same license as the postfixadmin package. -# Joe Hansen , 2012. -# -msgid "" -msgstr "" -"Project-Id-Version: postfixadmin\n" -"Report-Msgid-Bugs-To: postfixadmin@packages.debian.org\n" -"POT-Creation-Date: 2008-10-27 22:14+0100\n" -"PO-Revision-Date: 2012-04-11 19:21+0100\n" -"Last-Translator: Joe Hansen \n" -"Language-Team: Danish \n" -"Language: da\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "Web server to reconfigure automatically:" -msgstr "Internetserver at rekonfigurere automatisk:" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "" -"Please choose the web server that should be automatically configured to run " -"postfixadmin." -msgstr "" -"Vælg venligst internetserveren som automatisk skal konfigureres til at " -"køre postfixadmin." - diff --git a/debian/po/de.po b/debian/po/de.po deleted file mode 100644 index d5ac0a2f..00000000 --- a/debian/po/de.po +++ /dev/null @@ -1,32 +0,0 @@ -# German translation of debconf templates for postfixadmin. -# Copyright (C) 2012 Holger Wansing -# This file is distributed under the same license as the postfixadmin package. -# Holger Wansing , 2012. -# -msgid "" -msgstr "" -"Project-Id-Version: postfixadmin 2.3.5-1\n" -"Report-Msgid-Bugs-To: postfixadmin@packages.debian.org\n" -"POT-Creation-Date: 2008-10-27 22:14+0100\n" -"PO-Revision-Date: 2012-04-10 21:19+0200\n" -"Last-Translator: Holger Wansing \n" -"Language-Team: German \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "Web server to reconfigure automatically:" -msgstr "Webserver, der automatisch neu konfiguriert werden soll:" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "" -"Please choose the web server that should be automatically configured to run " -"postfixadmin." -msgstr "" -"Bitte wählen Sie den Webserver, der automatisch konfiguriert werden soll, um " -"Postfixadmin auszuführen." diff --git a/debian/po/es.po b/debian/po/es.po deleted file mode 100644 index 9c1bbe93..00000000 --- a/debian/po/es.po +++ /dev/null @@ -1,53 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# Changes: -# - Initial translation -# Matías Bellone , 2012 -# -# Traductores, si no conocen el formato PO, merece la pena leer la -# documentación de gettext, especialmente las secciones dedicadas a este -# formato, por ejemplo ejecutando: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Equipo de traducción al español, por favor, lean antes de traducir -# los siguientes documentos: -# -# - El proyecto de traducción de Debian al español -# http://www.debian.org/intl/spanish/ -# especialmente las notas de traducción en -# http://www.debian.org/intl/spanish/notas -# -# - La guía de traducción de po's de debconf: -# /usr/share/doc/po-debconf/README-trans -# o http://www.debian.org/intl/l10n/po-debconf/README-trans -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: postfixadmin@packages.debian.org\n" -"POT-Creation-Date: 2008-10-27 22:14+0100\n" -"PO-Revision-Date: 2012-04-15 04:27:00+00:00\n" -"Last-Translator: Matías Bellone \n" -"Language-Team: Debian Spanish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "Web server to reconfigure automatically:" -msgstr "Servidor web a reconfigurar automáticamente:" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "" -"Please choose the web server that should be automatically configured to run " -"postfixadmin." -msgstr "" -"Seleccione el servidor web que deberá ser configurado automáticamente " -"para ejecutar «postfixadmin»." diff --git a/debian/po/fr.po b/debian/po/fr.po deleted file mode 100644 index 11223fb6..00000000 --- a/debian/po/fr.po +++ /dev/null @@ -1,35 +0,0 @@ -# Translation of postfixadmin debconf template to French. -# Copyright (C) 2012 Debian French l10n team -# This file is distributed under the same license as the postfixadmin package. -# Translators: -# Christian Perrier , 2012. -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: postfixadmin@packages.debian.org\n" -"POT-Creation-Date: 2008-10-27 22:14+0100\n" -"PO-Revision-Date: 2012-04-07 19:46+0200\n" -"Last-Translator: Christian Perrier \n" -"Language-Team: French \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: fr\n" -"X-Generator: Lokalize 1.2\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "Web server to reconfigure automatically:" -msgstr "Serveur web à reconfigurer automatiquement :" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "" -"Please choose the web server that should be automatically configured to run " -"postfixadmin." -msgstr "" -"Veuillez choisir le serveur web qui doit être configuré automatiquement pour " -"exécuter postfixadmin." diff --git a/debian/po/it.po b/debian/po/it.po deleted file mode 100644 index 4c37ecf8..00000000 --- a/debian/po/it.po +++ /dev/null @@ -1,34 +0,0 @@ -# Italian translation of postfixadmin debconf messages. -# Copyright (C) 2012 postfixadmin package copyright holder -# This file is distributed under the same license as the postfixadmin package. -# Beatrice Torracca , 2012. -msgid "" -msgstr "" -"Project-Id-Version: postfixadmin\n" -"Report-Msgid-Bugs-To: postfixadmin@packages.debian.org\n" -"POT-Creation-Date: 2008-10-27 22:14+0100\n" -"PO-Revision-Date: 2012-04-07 16:15+0200\n" -"Last-Translator: Beatrice Torracca \n" -"Language-Team: Italian \n" -"Language: it\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: Virtaal 0.7.1\n" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "Web server to reconfigure automatically:" -msgstr "Server web da riconfigurare automaticamente:" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "" -"Please choose the web server that should be automatically configured to run " -"postfixadmin." -msgstr "" -"Scegliere il server web che deve essere configurato automaticamente per " -"eseguire postfixadmin." diff --git a/debian/po/nl.po b/debian/po/nl.po deleted file mode 100644 index 9b9f32cd..00000000 --- a/debian/po/nl.po +++ /dev/null @@ -1,32 +0,0 @@ -# Dutch translation of postfixadmin debconf templates. -# Copyright (C) 2012 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the postfixadmin package. -# Jeroen Schot , 2012. -# -msgid "" -msgstr "" -"Project-Id-Version: postfixadmin 2.3.5-1\n" -"Report-Msgid-Bugs-To: postfixadmin@packages.debian.org\n" -"POT-Creation-Date: 2008-10-27 22:14+0100\n" -"PO-Revision-Date: 2012-04-12 15:26+0200\n" -"Last-Translator: Jeroen Schot \n" -"Language-Team: Debian l10n Dutch \n" -"Language: nl\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "Web server to reconfigure automatically:" -msgstr "Automatisch te configureren webserver:" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "" -"Please choose the web server that should be automatically configured to run " -"postfixadmin." -msgstr "" -"Welke webserver moet automatisch worden geconfigureerd voor postfixadmin?" diff --git a/debian/po/pl.po b/debian/po/pl.po deleted file mode 100644 index 31842398..00000000 --- a/debian/po/pl.po +++ /dev/null @@ -1,37 +0,0 @@ -# Translation of ostfixadmi debconf templates to Polish. -# Copyright (C) 2008 -# This file is distributed under the same license as the ostfixadmi package. -# -# Michał Kułach , 2012. -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: postfixadmin@packages.debian.org\n" -"POT-Creation-Date: 2008-10-27 22:14+0100\n" -"PO-Revision-Date: 2012-04-07 18:47+0200\n" -"Last-Translator: Michał Kułach \n" -"Language-Team: Polish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: pl\n" -"X-Generator: Lokalize 1.2\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "Web server to reconfigure automatically:" -msgstr "Serwer WWW do automatycznej konfiguracji:" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "" -"Please choose the web server that should be automatically configured to run " -"postfixadmin." -msgstr "" -"Proszę wybrać serwer WWW, który powinien być automatycznie skonfigurowany w " -"celu uruchomienia postfixadmin." - diff --git a/debian/po/pt.po b/debian/po/pt.po deleted file mode 100644 index 89c17c4d..00000000 --- a/debian/po/pt.po +++ /dev/null @@ -1,32 +0,0 @@ -# Portuguese translation for postfixadmin (debconf) -# This file is distributed under the same license as the postfixadmin package. -# Rui Branco , 2012. -# -msgid "" -msgstr "" -"Project-Id-Version: postfixadmin 2.3.5-1\n" -"Report-Msgid-Bugs-To: postfixadmin@packages.debian.org\n" -"POT-Creation-Date: 2008-10-27 22:14+0100\n" -"PO-Revision-Date: 2012-04-09 21:26+0100\n" -"Last-Translator: Rui Branco \n" -"Language-Team: Portuguese \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" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "Web server to reconfigure automatically:" -msgstr "Servidor Web a reconfigurar automaticamente:" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "" -"Please choose the web server that should be automatically configured to run " -"postfixadmin." -msgstr "" -"Por favor escolha o servidor web a ser reconfigurado para correr o " -"postfixadmin." diff --git a/debian/po/ru.po b/debian/po/ru.po deleted file mode 100644 index 31c1b920..00000000 --- a/debian/po/ru.po +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the postfixadmin package. -# -# Yuri Kozlov , 2012. -msgid "" -msgstr "" -"Project-Id-Version: 2.3.5-1\n" -"Report-Msgid-Bugs-To: postfixadmin@packages.debian.org\n" -"POT-Creation-Date: 2008-10-27 22:14+0100\n" -"PO-Revision-Date: 2012-04-09 20:40+0400\n" -"Last-Translator: Yuri Kozlov \n" -"Language-Team: Russian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: ru\n" -"X-Generator: Lokalize 1.2\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<" -"=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "Web server to reconfigure automatically:" -msgstr "Веб-сервер для автоматической перенастройки:" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "" -"Please choose the web server that should be automatically configured to run " -"postfixadmin." -msgstr "" -"Выберите веб-сервер, который нужно автоматически настроить для запуска " -"dpostfixadmin." - diff --git a/debian/po/sv.po b/debian/po/sv.po deleted file mode 100644 index 7df9247f..00000000 --- a/debian/po/sv.po +++ /dev/null @@ -1,33 +0,0 @@ -# Translation of postfixadmin debconf template to Swedish -# Copyright (C) 2012 Martin Bagge -# This file is distributed under the same license as the postfixadmin package. -# -# Martin Bagge , 2012 -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: postfixadmin@packages.debian.org\n" -"POT-Creation-Date: 2008-10-27 22:14+0100\n" -"PO-Revision-Date: 2012-04-10 18:40+0100\n" -"Last-Translator: Martin Bagge / brother \n" -"Language-Team: Swedish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Swedish\n" -"X-Poedit-Country: Sweden\n" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "Web server to reconfigure automatically:" -msgstr "Webbservrar som ska ställas in automatiskt:" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "" -"Please choose the web server that should be automatically configured to run " -"postfixadmin." -msgstr "" -"Välj webbservrar som automatiskt ska ställas in för att köra postfixadmin." diff --git a/debian/po/templates.pot b/debian/po/templates.pot deleted file mode 100644 index 761557aa..00000000 --- a/debian/po/templates.pot +++ /dev/null @@ -1,31 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: postfixadmin@packages.debian.org\n" -"POT-Creation-Date: 2008-10-27 22:14+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "Web server to reconfigure automatically:" -msgstr "" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "" -"Please choose the web server that should be automatically configured to run " -"postfixadmin." -msgstr "" diff --git a/debian/po/zh_TW.po b/debian/po/zh_TW.po deleted file mode 100644 index 39f79e09..00000000 --- a/debian/po/zh_TW.po +++ /dev/null @@ -1,31 +0,0 @@ -# Chinese translations for PACKAGE package. -# Copyright (C) 2012 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Vincent Chen , 2012. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: postfixadmin@packages.debian.org\n" -"POT-Creation-Date: 2008-10-27 22:14+0100\n" -"PO-Revision-Date: 2012-04-09 18:25-0700\n" -"Last-Translator: Vincent Chen \n" -"Language-Team: Chinese (traditional)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: zh_TW\n" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "Web server to reconfigure automatically:" -msgstr "網頁伺服器將自動重新設定：" - -#. Type: multiselect -#. Description -#: ../templates:1001 -msgid "" -"Please choose the web server that should be automatically configured to run " -"postfixadmin." -msgstr "請選擇要自動執行 postfixadmin 的網頁伺服器" diff --git a/debian/postfixadmin.apache2 b/debian/postfixadmin.apache2 new file mode 100644 index 00000000..771059e2 --- /dev/null +++ b/debian/postfixadmin.apache2 @@ -0,0 +1 @@ +conf debian/apache/postfixadmin.conf \ No newline at end of file diff --git a/debian/postfixadmin.config b/debian/postfixadmin.config index 9de7af4f..25fbd3bd 100644 --- a/debian/postfixadmin.config +++ b/debian/postfixadmin.config @@ -2,9 +2,6 @@ set -e . /usr/share/debconf/confmodule -db_version 2.0 -db_input high postfixadmin/reconfigure-webserver || true -db_go || true if [ -f /usr/share/dbconfig-common/dpkg/config ]; then # we support mysql and pgsql diff --git a/debian/postfixadmin.dirs b/debian/postfixadmin.dirs index c5c52bf3..688e63bb 100644 --- a/debian/postfixadmin.dirs +++ b/debian/postfixadmin.dirs @@ -2,4 +2,3 @@ usr/share/postfixadmin usr/share/postfixadmin/css usr/share/doc/postfixadmin etc/postfixadmin -etc/apache2/conf.d diff --git a/debian/postfixadmin.install b/debian/postfixadmin.install index dba83688..052c6cb9 100644 --- a/debian/postfixadmin.install +++ b/debian/postfixadmin.install @@ -1,14 +1,9 @@ *.php usr/share/postfixadmin -*.js usr/share/postfixadmin -configs usr/share/postfixadmin +admin usr/share/postfixadmin css usr/share/postfixadmin images usr/share/postfixadmin languages usr/share/postfixadmin model usr/share/postfixadmin -scripts usr/share/postfixadmin -smarty usr/share/postfixadmin templates usr/share/postfixadmin -templates_c usr/share/postfixadmin users usr/share/postfixadmin -debian/apache.conf etc/postfixadmin -debian/lighttpd.conf etc/postfixadmin +debian/lighttpd/90-postfixadmin.conf etc/lighttpd/conf-available diff --git a/debian/postfixadmin.maintscript b/debian/postfixadmin.maintscript new file mode 100644 index 00000000..c176d1c5 --- /dev/null +++ b/debian/postfixadmin.maintscript @@ -0,0 +1,3 @@ +# move webserver configuration files +mv_conffile /etc/postfixadmin/apache.conf /etc/apache2/conf-available/postfixadmin.conf 2.3.7-1~ +mv_conffile /etc/postfixadmin/lighttpd.conf /etc/lighttpd/conf-available/postfixadmin.conf 2.3.7-1~ diff --git a/debian/postfixadmin.postinst b/debian/postfixadmin.postinst index 5d361676..7b15a089 100644 --- a/debian/postfixadmin.postinst +++ b/debian/postfixadmin.postinst @@ -8,24 +8,17 @@ if [ "$1" = "configure" ]; then . /usr/share/debconf/confmodule . /usr/share/dbconfig-common/dpkg/postinst dbc_go postfixadmin $@ - - # configure webserver stuff - db_get postfixadmin/reconfigure-webserver - servers="$RET" - restart="$servers" - linkdestination_apache="../../postfixadmin/apache.conf" - linkdestination_lighttpd="../../postfixadmin/lighttpd.conf" - linkname="postfixadmin" - if [ -e /usr/share/wwwconfig-common/confd-link.sh ]; then - . /usr/share/wwwconfig-common/confd-link.sh - else - . /usr/share/postfixadmin/confd-link.sh - fi - . /usr/share/wwwconfig-common/restart.sh fi -#DEBHELPER# +# remove legacy apache and lighthttpd configuration symlink, +# conf.d is no longer supported with Apache 2.4 +if [ "$(readlink /etc/apache2/conf.d/postfixadmin)" = "../../postfixadmin/apache.conf" ]; then + rm -f /etc/apache2/conf.d/postfixadmin +fi +if [ "$(readlink /etc/lighttpd/conf-available/postfixadmin)" = "../../postfixadmin/lighttpd.conf" ]; then + rm -f /etc/lighttpd/conf-available/postfixadmin +fi -chown www-data /usr/share/postfixadmin/templates_c +#DEBHELPER# exit 0 diff --git a/debian/postfixadmin.postrm b/debian/postfixadmin.postrm index 1ef33b06..1fe5d81c 100644 --- a/debian/postfixadmin.postrm +++ b/debian/postfixadmin.postrm @@ -6,16 +6,6 @@ if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then . /usr/share/debconf/confmodule db_version 2.0 - # restart the webserver only if we know which one was configured. - if db_get postfixadmin/reconfigure-webserver; then - servers="$RET" - restart=$servers - linkname="postfixadmin" - if [ -e /usr/share/wwwconfig-common/restart.sh ]; then - . /usr/share/wwwconfig-common/restart.sh - fi - fi - if [ -f /usr/share/dbconfig-common/dpkg/postrm ]; then . /usr/share/dbconfig-common/dpkg/postrm dbc_go postfixadmin $@ diff --git a/debian/postfixadmin.prerm b/debian/postfixadmin.prerm index 87241c47..3b553f1e 100644 --- a/debian/postfixadmin.prerm +++ b/debian/postfixadmin.prerm @@ -8,17 +8,4 @@ if [ -f /usr/share/dbconfig-common/dpkg/prerm ]; then dbc_go postfixadmin $@ fi -if [ -f /usr/share/debconf/confmodule ]; then - . /usr/share/debconf/confmodule - db_version 2.0 - db_get postfixadmin/reconfigure-webserver - servers="$RET" - linkname="postfixadmin" - if [ -e /usr/share/wwwconfig-common/confd-link.sh ]; then - . /usr/share/wwwconfig-common/confd-link.sh - else - . /usr/share/postfixadmin/confd-link.sh - fi -fi - #DEBHELPER# diff --git a/debian/rules b/debian/rules index bae9ca0d..8c6dbabc 100755 --- a/debian/rules +++ b/debian/rules @@ -7,6 +7,7 @@ export VERSION = $(shell grep -E "version = '.*';" functions.inc.php |sed -e "s/.version = '//" |sed -e "s/';.*//" |sed -e "s/ /-/g") export DEBVERSION = $(shell grep -E "postfixadmin .([0-9]+|\.)+" debian/changelog |head -1 |sed -e "s/postfixadmin .//" |sed -e "s/-.*//") + build: build-arch build-indep build-arch: build-stamp build-indep: build-stamp @@ -14,16 +15,10 @@ build-stamp: dh_testdir touch build-stamp -# Create a needed tar.gz file to build a non-nativ .dpkg -prep: - rm -f ../postfixadmin_*orig.tar.gz - cd ..; tar --exclude-vcs --exclude=$(notdir ${CURDIR})/debian --exclude=$(notdir ${CURDIR})/.pc -cvzf postfixadmin_${DEBVERSION}.orig.tar.gz $(notdir ${CURDIR}) - clean: dh_testdir dh_testroot dh_clean - debconf-updatepo install: build dh_testdir @@ -31,12 +26,9 @@ install: build dh_prep dh_installdirs dh_install + dh_apache2 mv debian/postfixadmin/usr/share/postfixadmin/config.inc.php debian/postfixadmin/etc/postfixadmin/config.inc.php find debian/postfixadmin -name .svn | xargs -r rm -r - chmod +x debian/postfixadmin/usr/share/postfixadmin/scripts/postfixadmin-cli - chmod +x debian/postfixadmin/usr/share/postfixadmin/scripts/postfixadmin-cli.php - chown www-data debian/postfixadmin/usr/share/postfixadmin/templates_c - # Build architecture-independent files here. binary-indep: build install diff --git a/debian/stamp-patched b/debian/stamp-patched new file mode 100644 index 00000000..e69de29b diff --git a/debian/templates b/debian/templates deleted file mode 100644 index 9405de95..00000000 --- a/debian/templates +++ /dev/null @@ -1,6 +0,0 @@ -Template: postfixadmin/reconfigure-webserver -Type: multiselect -Choices: apache2, apache, apache-ssl, apache-perl, lighttpd -_Description: Web server to reconfigure automatically: - Please choose the web server that should be automatically configured - to run postfixadmin.