richard: server/kolabd/kolabd/dist_conf common, 1.13, 1.14 debian, 1.1, 1.2 kolab, 1.17, 1.18 suse, 1.18, 1.19

cvs at intevation.de cvs at intevation.de
Sun Jan 15 11:46:37 CET 2006


Author: richard

Update of /kolabrepository/server/kolabd/kolabd/dist_conf
In directory doto:/tmp/cvs-serv24986/dist_conf

Modified Files:
	common debian kolab suse 
Log Message:
use more fine grained variables for sasl configuration files.  Changed
emailserver_sasl_confdir to sasl_smtpdconffile and sasl_confdir to
sasl_authdconffile.  This is needed for non openpkg based distributions.



Index: common
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/common,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- common	6 Jan 2006 20:37:43 -0000	1.13
+++ common	15 Jan 2006 10:46:35 -0000	1.14
@@ -41,7 +41,6 @@
 	-e 's,[@]emailserver_localstatedir[@],$(emailserver_localstatedir),g' \
 	-e 's,[@]emailserver_logfile[@],$(emailserver_logfile),g' \
 	-e 's,[@]emailserver_musr[@],$(emailserver_musr),g' \
-	-e 's,[@]emailserver_sasl_conffile[@],$(emailserver_sasl_conffile),g' \
 	-e 's,[@]emailserver_socket[@],$(emailserver_socket),g' \
 	-e 's,[@]emailserver_usr[@],$(emailserver_usr),g' \
 	-e 's,[@]fbview_logfile[@],$(fbview_logfile),g' \
@@ -100,8 +99,9 @@
 	-e 's,[@]resmgr_logfile[@],$(resmgr_logfile),g' \
 	-e 's,[@]resmgr_usr[@],$(resmgr_usr),g' \
 	-e 's,[@]resmgr_filterdir[@],$(resmgr_filterdir),g' \
-	-e 's,[@]sasl_confdir[@],$(sasl_confdir),g' \
+	-e 's,[@]sasl_authdconffile[@],$(sasl_authdconffile),g' \
 	-e 's,[@]sasl_logfile[@],$(sasl_logfile),g' \
+	-e 's,[@]sasl_smtpconffile[@],$(sasl_smtpconffile),g' \
 	-e 's,[@]webserver_acceptlock[@],$(webserver_acceptlock),g' \
 	-e 's,[@]webserver_accesslogfile[@],$(webserver_accesslogfile),g' \
 	-e 's,[@]webserver_cgidir[@],$(webserver_cgidir),g' \

Index: debian
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/debian,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- debian	1 Jan 2006 21:20:24 -0000	1.1
+++ debian	15 Jan 2006 10:46:35 -0000	1.2
@@ -51,7 +51,6 @@
 emailserver_socket=${libdir}/postfix/lmtp
 emailserver_localstatedir=${localstatedir}/spool/postfix
 emailserver_logfile=${localstatedir}/log/mail.log
-emailserver_sasl_conffile=${libdir}/sasl2/smtpd.conf
 emailserver_usr=${kolab_usr}
 emailserver_musr=kolab
 emailserver_grp=${restricted_kolab_grp}
@@ -119,7 +118,8 @@
 phplibdir2=${datadir}/php
 phppeardir=${phplibdir}/PEAR
 
-sasl_confdir=${sysconfdir}/sasl
+sasl_authdconffile=${sysconfdir}/sasl/____
+sasl_smtpconffile=${libdir}/sasl2/smtpd.conf
 sasl_logfile=${localstatedir}/log/saslauthd.log
 
 resmgr_logfile=${localstatedir}/log/resmgr.log

Index: kolab
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolab,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- kolab	14 Jan 2006 22:45:54 -0000	1.17
+++ kolab	15 Jan 2006 10:46:35 -0000	1.18
@@ -68,7 +68,6 @@
 emailserver_socket=${localstatedir}/kolab/lmtp
 emailserver_localstatedir=${localstatedir}/postfix
 emailserver_logfile=${emailserver_localstatedir}/log/postfix.log
-emailserver_sasl_conffile=${sysconfdir}/sasl/apps/smtpd.conf
 emailserver_usr=${kolab_usr}
 emailserver_musr=kolab
 emailserver_grp=kolab-r
@@ -143,7 +142,8 @@
 phplibdir2=${kolab_statedir}/php
 phppeardir=${phplibdir2}/pear
 
-sasl_confdir=${sysconfdir}/sasl
+sasl_authdconffile=${sysconfdir}/sasl/saslauthd.conf
+sasl_smtpconffile=${sysconfdir}/sasl/apps/smtpd.conf
 sasl_logfile=${localstatedir}/sasl/log/saslauthd.log
 
 sysrundir=${localstatedir}/run

Index: suse
===================================================================
RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/suse,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- suse	9 Jan 2006 21:44:31 -0000	1.18
+++ suse	15 Jan 2006 10:46:35 -0000	1.19
@@ -52,7 +52,6 @@
 emailserver_socket=${libdir}/postfix/lmtp
 emailserver_localstatedir=${localstatedir}/spool/postfix
 emailserver_logfile=${localstatedir}/log/postfix.log
-emailserver_sasl_conffile=${libdir}/sasl2/smtpd.conf
 emailserver_usr=postfix
 emailserver_musr=maildrop
 emailserver_grp=root
@@ -120,7 +119,8 @@
 phplibdir2=${datadir}/php
 phppeardir=${phplibdir}/PEAR
 
-sasl_confdir=${sysconfdir}/sasl
+sasl_smtpconffile=${libdir}/sasl2/smtpd.conf
+sasl_authdconffile=${sysconfdir}/sasl/___
 sasl_logfile=${localstatedir}/log/saslauthd.log
 
 resmgr_logfile=${localstatedir}/log/resmgr.log





More information about the commits mailing list