Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Dear release managers, please approve the upload of tryton-server_3.4.0-2. I intended to wait for the bug fix release for the 3.4 series, but as that takes longer than expected I assume it is meanwhile too late to get those fixes of severity important or less into jessie. Therefore here come the last fixes for tryton-server, that include * moving the old configuration file to a backup place. * removing an unnecessary Recommend * documentation fixes. debdiff attached Thank you! unblock: tryton-server/3.4.0-2
diff -Nru tryton-server-3.4.0/debian/changelog tryton-server-3.4.0/debian/changelog
--- tryton-server-3.4.0/debian/changelog 2014-10-23 13:22:48.000000000 +0200
+++ tryton-server-3.4.0/debian/changelog 2014-12-02 11:06:28.000000000 +0100
@@ -1,3 +1,15 @@
+tryton-server (3.4.0-2) unstable; urgency=medium
+
+ * Adding path to the configuration file to the commands in the README.
+ * Adding path to the configuration file to the commands in NEWS.
+ * Correcting conf file handling.
+ * Removing python-openssl from Recommends, no more needed.
+ * Improving the documentation in trytond.conf.
+ * Correcting documentation in trytond.conf to reflect current ipv6
+ behavior.
+
+ -- Mathias Behrle <mathi...@m9s.biz> Tue, 02 Dec 2014 11:06:28 +0100
+
tryton-server (3.4.0-1) unstable; urgency=medium
* Merging upstream version 3.4.0.
diff -Nru tryton-server-3.4.0/debian/control tryton-server-3.4.0/debian/control
--- tryton-server-3.4.0/debian/control 2014-10-21 11:29:26.000000000 +0200
+++ tryton-server-3.4.0/debian/control 2014-10-30 17:33:24.000000000 +0100
@@ -20,7 +20,7 @@
python-pkg-resources
Recommends:
postgresql, python-psycopg2, postgresql-client, python-levenshtein,
- python-bcrypt, python-pydot, python-webdav, python-openssl, ssl-cert, unoconv
+ python-bcrypt, python-pydot, python-webdav, ssl-cert, unoconv
Suggests:
tryton-client | tryton-neso, tryton-server-doc, tryton-modules-all,
python-sphinx, libreoffice-draw, libreoffice-writer,
diff -Nru tryton-server-3.4.0/debian/NEWS tryton-server-3.4.0/debian/NEWS
--- tryton-server-3.4.0/debian/NEWS 2014-10-22 23:24:05.000000000 +0200
+++ tryton-server-3.4.0/debian/NEWS 2014-10-30 15:53:04.000000000 +0100
@@ -6,11 +6,12 @@
The format of the configuration file changed to a simple ini style
format. There is no automatic migration of old configuration settings.
So be sure to adapt /etc/tryton/trytond.conf (or whatever configuration
- file you may use) to the new format.
+ file you may use) to the new format (the old configuration file was saved
+ to /etc/tryton/trytond.conf.pre34).
As for each major release don't forget to backup your database(s) and
then run the database update with
- # trytond --all -d <your_database_name>
+ # trytond -c /etc/tryton/trytond.conf --all -d <your_database_name>
and restart the server with
# service tryton-server restart
diff -Nru tryton-server-3.4.0/debian/trytond.conf tryton-server-3.4.0/debian/trytond.conf
--- tryton-server-3.4.0/debian/trytond.conf 2014-10-22 22:55:58.000000000 +0200
+++ tryton-server-3.4.0/debian/trytond.conf 2014-12-02 10:46:59.000000000 +0100
@@ -12,14 +12,21 @@
# The URI to connect to the SQL database (following RFC-3986)
# uri = database://username:password@host:port/
+# (Internal default: sqlite:// (i.e. a local SQLite database))
#
-# PostgreSQL via TCP/IP
-#uri = postgresql://tryton:tryton@localhost:5432/
# PostgreSQL via Unix domain sockets
+# (e.g. PostgreSQL database running on the same machine (localhost))
#uri = postgresql://tryton:tryton@/
+#
+# PostgreSQL via TCP/IP
+# (e.g. connecting to a PostgreSQL database running on a remote machine or
+# by means of md5 authentication. Needs PostgreSQL to be configured to accept
+# those connections (pg_hba.conf).)
+#uri = postgresql://tryton:tryton@localhost:5432/
# The path to the directory where the Tryton Server stores files.
# The server must have write permissions to this directory.
+# (Internal default: /var/lib/trytond)
path = /var/lib/tryton
# Shall available databases be listed in the client?
@@ -49,10 +56,13 @@
# Settings for the JSON-RPC network interface
# The IP/host and port number of the interface
-#listen = localhost:8000
+# (Internal default: localhost:8000)
+#
+# Listen on all interfaces (IPv4)
+#listen = 0.0.0.0:8000
#
# Listen on all interfaces (IPv4 and IPv6)
-#listen = 0.0.0.0:8000,*:8000
+#listen = [::]:8000
# The hostname for this interface
#hostname =
diff -Nru tryton-server-3.4.0/debian/tryton-server.postinst tryton-server-3.4.0/debian/tryton-server.postinst
--- tryton-server-3.4.0/debian/tryton-server.postinst 2014-10-23 12:22:20.000000000 +0200
+++ tryton-server-3.4.0/debian/tryton-server.postinst 2014-10-30 15:52:16.000000000 +0100
@@ -3,8 +3,11 @@
set -e
TRYTON_USER="tryton"
-TRYTON_CONFFILE="/etc/tryton/trytond.conf"
-TRYTON_LOGCONFFILE="/etc/tryton/trytond_log.conf"
+TRYTON_OLDCONFFILE="/etc/trytond.conf"
+TRYTON_CONFDIR="/etc/tryton"
+TRYTON_CONFFILE="${TRYTON_CONFDIR}/trytond.conf"
+TRYTON_LOGCONFFILE="${TRYTON_CONFDIR}/trytond_log.conf"
+TRYTON_CONFFILEPRE34="${TRYTON_CONFDIR}/trytond.conf.pre34"
TRYTON_LOGDIR="/var/log/tryton"
TRYTON_HOMEDIR="/var/lib/tryton"
@@ -24,11 +27,18 @@
# Setting ownership and permissions on configuration file
# trytond uses internal defaults, if it cannot read the
# configuration file.
- chown ${TRYTON_USER}:${TRYTON_USER} ${TRYTON_CONFFILE} ${TRYTON_LOGCONFFILE}
- if ! dpkg-statoverride --list "${TRYTON_CONFFILE}" > /dev/null 2>&1
- then
- chmod 0440 "${TRYTON_CONFFILE}"
- chmod 0440 "${TRYTON_LOGCONFFILE}"
+ for _ITEM in "${TRYTON_CONFFILE}" "${TRYTON_LOGCONFFILE}"
+ do
+ if ! dpkg-statoverride --list "${_ITEM}" > /dev/null 2>&1
+ then
+ chown "${TRYTON_USER}":"${TRYTON_USER}" "${_ITEM}"
+ chmod 0440 "${_ITEM}"
+ fi
+ done
+
+ # Migration from 3.2 to 3.4: backup old configuration to new configuration location
+ if [ -e "$TRYTON_OLDCONFFILE" ]; then
+ mv -f "${TRYTON_OLDCONFFILE}" "${TRYTON_CONFFILEPRE34}"
fi
# Restricting access to home and log directories for security reasons (private information)
diff -Nru tryton-server-3.4.0/debian/tryton-server.postrm tryton-server-3.4.0/debian/tryton-server.postrm
--- tryton-server-3.4.0/debian/tryton-server.postrm 2014-10-23 12:49:52.000000000 +0200
+++ tryton-server-3.4.0/debian/tryton-server.postrm 2014-10-30 15:34:45.000000000 +0100
@@ -4,8 +4,10 @@
TRYTON_USER="tryton"
TRYTON_OLDCONFFILE="/etc/trytond.conf"
-TRYTON_CONFFILE="/etc/tryton/trytond.conf"
-TRYTON_LOGCONFFILE="/etc/tryton/trytond_log.conf"
+TRYTON_CONFDIR="/etc/tryton"
+TRYTON_CONFFILE="${TRYTON_CONFDIR}/trytond.conf"
+TRYTON_LOGCONFFILE="${TRYTON_CONFDIR}/trytond_log.conf"
+TRYTON_CONFFILEPRE34="${TRYTON_CONFDIR}/trytond.conf.pre34"
TRYTON_LOGDIR="/var/log/tryton"
TRYTON_HOMEDIR="/var/lib/tryton"
@@ -26,8 +28,14 @@
# Removing log directory
rmdir --ignore-fail-on-non-empty ${TRYTON_LOGDIR} > /dev/null 2>&1 || true
+ # Removing (potentially) leftover old configuration backup
+ rm -f "${TRYTON_CONFFILEPRE34}"
+
# Removing (potentially) empty directories
- rmdir --ignore-fail-on-non-empty ${TRYTON_HOMEDIR} > /dev/null 2>&1 || true
+ for _ITEM in "${TRYTON_CONFDIR}" "${TRYTON_LOGDIR}"
+ do
+ rmdir --ignore-fail-on-non-empty ${_ITEM} > /dev/null 2>&1 || true
+ done
;;
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
diff -Nru tryton-server-3.4.0/debian/tryton-server.README.Debian tryton-server-3.4.0/debian/tryton-server.README.Debian
--- tryton-server-3.4.0/debian/tryton-server.README.Debian 2014-10-22 23:17:31.000000000 +0200
+++ tryton-server-3.4.0/debian/tryton-server.README.Debian 2014-10-27 16:00:13.000000000 +0100
@@ -87,7 +87,7 @@
* Initializing the database:
- # /usr/bin/trytond -u res -d tryton
+ # /usr/bin/trytond -c /etc/tryton/trytond.conf -u res -d tryton
Note: Use the database name you chose in the previous step (here as default: tryton).
You will be asked for the admin password for this database.
@@ -101,7 +101,7 @@
version string) you have to update your database(s).
After the categorically recommended backup do:
- # /usr/bin/trytond --all -d tryton
+ # /usr/bin/trytond -c /etc/tryton/trytond.conf --all -d tryton
Remember to replace tryton with the name of your database.
pgp5HgsJTlSwR.pgp
Description: Digitale Signatur von OpenPGP
