[Amavisd-new-commits] [pkg-amavisd-new] 04/08: Fix paths in amavis helper scripts

[Alexander Wirt]

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

formorer pushed a commit to branch master
in repository pkg-amavisd-new.

commit 0f51c612820ad2e9d4d32bf8701975bee9d4a1d6
Author: Alexander Wirt <formorer at debian.org>
Date:   Sat May 10 14:50:42 2014 +0200

    Fix paths in amavis helper scripts
---
 debian/patches/95_amavisd_helpers_fixes | 56 +++++++++++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 2 files changed, 57 insertions(+)

diff --git a/debian/patches/95_amavisd_helpers_fixes b/debian/patches/95_amavisd_helpers_fixes
new file mode 100644
index 0000000..72c9073
--- /dev/null
+++ b/debian/patches/95_amavisd_helpers_fixes
@@ -0,0 +1,56 @@
+--- a/amavis-mc
++++ b/amavis-mc
+@@ -70,10 +70,10 @@
+ 
+ ### USER CONFIGURABLE:
+ 
+-$daemon_user  = 'vscan';
+-$daemon_group = 'vscan';
++$daemon_user  = 'amavis';
++$daemon_group = 'amavis';
+ 
+-$pid_file = '/var/amavis/amavis-mc.pid';
++$pid_file = '/var/run/amavis/amavis-mc.pid';
+ 
+ $log_level = 0;
+ $syslog_ident = 'amavis-mc';
+--- a/amavis-services
++++ b/amavis-services
+@@ -71,7 +71,7 @@
+ $syslog_facility = LOG_MAIL;
+ $syslog_ident = $myproduct_name;
+ 
+-$MYHOME = '/var/amavis';
++$MYHOME = '/var/lib/amavis';
+ 
+ # A socket to which amavisd child processes report their data.
+ # should match one of the sockets in @zmq_sockets in amavisd.conf
+--- a/amavisd-submit
++++ b/amavisd-submit
+@@ -72,9 +72,9 @@
+ ### USER CONFIGURABLE:
+ 
+   $log_level = 0;
+-  $tempbase = '/var/amavis/tmp';  # where to create a temp directory with a msg
++  $tempbase = '/var/lib/amavis/tmp';  # where to create a temp directory with a msg
+ 
+-  $socketname = '/var/amavis/amavisd.sock';
++  $socketname = '/var/lib/amavis/amavisd.sock';
+ # $socketname = '127.0.0.1:9998';
+ # $socketname = '[::1]:9998';
+ 
+--- a/amavisd-signer
++++ b/amavisd-signer
+@@ -86,9 +86,9 @@
+ # Please adjust the following settings as necessary:
+ #
+ 
+-$daemon_user  = 'vscan';
+-$daemon_group = 'vscan';
+-# $daemon_chroot_dir = '/var/amavis';   # chroot directory or undef
++$daemon_user  = 'amavis';
++$daemon_group = 'amavis';
++# $daemon_chroot_dir = '/var/lib/amavis';   # chroot directory or undef
+ 
+ # $daemonize = 1;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 460ab60..06a46d5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 60-amavisd-snmp-subagent_paths.patch
 85-clarify_fqdn_error.patch
 90_fix_snmp_subagent_warning
+95_amavisd_helpers_ixes

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/amavisd-new/pkg-amavisd-new.git