[DRE-commits] [schleuder] 01/01: d/patches: Update 0002-etc-fix-paths.patch (manpage and default conf)

[Sebastien Badia]

This is an automated email from the git hooks/post-receive script.

sbadia pushed a commit to branch 3.0.0_beta14-1
in repository schleuder.

commit 4ea496b7e3286064d6c2105c54abfd2edfc77907
Author: Sebastien Badia <sbadia at debian.org>
Date:   Sat Jan 7 14:03:27 2017 +0100

    d/patches: Update 0002-etc-fix-paths.patch (manpage and default conf)
---
 debian/patches/0002-etc-fix-paths.patch | 47 +++++++++++++++++++++++++++++++--
 1 file changed, 45 insertions(+), 2 deletions(-)

diff --git a/debian/patches/0002-etc-fix-paths.patch b/debian/patches/0002-etc-fix-paths.patch
index 8f74874..0b6bcad 100644
--- a/debian/patches/0002-etc-fix-paths.patch
+++ b/debian/patches/0002-etc-fix-paths.patch
@@ -1,10 +1,11 @@
-Description: etc/: Fix paths used by upstream
+Description: Fix paths used by upstream
  Upstream uses default paths like '/var/schleuder' which obviously
  violate policies and common standards, like FHS for example. We need to
  fix this. Upstream is aware of this patch and we're working on
  integrating it.
 Author: Georg Faerber <georg at riseup.net>
-Last-Update: 2016-12-06
+Reviewed-by: Sebastien Badia <sbadia at debian.org>
+Last-Update: 2017-01-07
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/etc/schleuder.yml
@@ -29,3 +30,45 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  
  # Note: The API-daemon will bind only to localhost if no TLS-cert+keys are available.
  api:
+--- a/lib/schleuder/conf.rb
++++ b/lib/schleuder/conf.rb
+@@ -5,8 +5,8 @@ module Schleuder
+     EMAIL_REGEXP = /\A.+ at .+\z/i
+ 
+     DEFAULTS = {
+-      'lists_dir' => '/var/schleuder/lists',
+-      'listlogs_dir' => '/var/schleuder/lists',
++      'lists_dir' => '/var/lib/schleuder/lists',
++      'listlogs_dir' => '/var/lib/schleuder/lists',
+       'plugins_dir' => '/etc/schleuder/plugins',
+       'log_level' => 'warn',
+       'smtp_settings' => {
+@@ -24,7 +24,7 @@ module Schleuder
+       'database' => {
+         'production' => {
+           'adapter' =>  'sqlite3',
+-          'database' => '/var/schleuder/db.sqlite'
++          'database' => '/var/lib/schleuder/db.sqlite'
+         }
+       },
+       'api' => {
+--- a/man/schleuder.8
++++ b/man/schleuder.8
+@@ -64,7 +64,7 @@ To connect the MTA with Schleuder it mus
+ For more information on how to integrate Schleuder with your existing mail setup, please read the Schleuder documentation online (\fISEE ALSO\fR)\.
+ .
+ .SS "Data storage"
+-The keyrings for each list are standard GnuPG keyrings and sit in the filesystem under \fIlists_dir\fR/\fIhostname\fR/\fIlistname\fR/ (\fIlists_dir\fR is read from schleuder\.yml, by default it is </var/schleuder/lists>)\. They can be used manually using gpg2\. Please be careful to maintain proper file permissions if you touch the files\.
++The keyrings for each list are standard GnuPG keyrings and sit in the filesystem under \fIlists_dir\fR/\fIhostname\fR/\fIlistname\fR/ (\fIlists_dir\fR is read from schleuder\.yml, by default it is </var/lib/schleuder/lists>)\. They can be used manually using gpg2\. Please be careful to maintain proper file permissions if you touch the files\.
+ .
+ .P
+ In the list\-directory there’s also a list specific log\-file (might be missing if the log\-level is high and no error occurred yet)\.
+@@ -135,7 +135,7 @@ Internal failure in incoming email proce
+ \fB/etc/schleuder/list\-defaults\.yml\fR: default path of default list settings
+ .
+ .IP "\(bu" 4
+-\fB/var/schleuder/\fR default path of lists_dir
++\fB/var/lib/schleuder/\fR default path of lists_dir
+ .
+ .IP "\(bu" 4
+ \fB<lists_dir>\fR/\fB<hostname>\fR/`\fIlistname\fR: list internal data

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/schleuder.git