Add cnid_dbd logging option to netatalk.conf and to all startup scripts. Also deactiv...

diff --git a/config/netatalk.conf b/config/netatalk.conf
index 7fffc0afbff41c6f57bc62130d0920e12897b2ea..5c24d16e7299c790adfbbbe4c86028585e09d186 100644 (file)
--- a/config/netatalk.conf
+++ b/config/netatalk.conf
@@ -1,4 +1,4 @@
-# Appletalk configuration
+# Netatalk configuration
 # Change this to increase the maximum number of clients that can connect:
 AFPD_MAX_CLIENTS=20
 
@@ -12,16 +12,16 @@ ATALK_NAME=`echo ${HOSTNAME}|cut -d. -f1`
 ATALK_MAC_CHARSET='MAC_ROMAN'
 ATALK_UNIX_CHARSET='LOCALE'
 
-# specify this if you don't want guest, clrtxt, and dhx
-# available options: uams_guest.so, uams_clrtxt.so, uams_dhx.so, 
-#                   uams_randnum.so
-#AFPD_UAMLIST="-U uams_clrtxt.so,uams_randnum.so"
+# specify the UAMs to enable
+# available options: uams_guest.so, uams_clrtxt.so, uams_randnum.so, 
+#                           uams_dhx.so, uams_dhx2.so
+AFPD_UAMLIST="-U uams_guest.so,uams_dhx2.so"
 
 # Change this to set the id of the guest user
 AFPD_GUEST=nobody
 
 # Set which daemons to run (papd is dependent upon atalkd):
-ATALKD_RUN=yes
+ATALKD_RUN=no
 PAPD_RUN=NO
 CNID_METAD_RUN=yes
 AFPD_RUN=yes
@@ -34,3 +34,6 @@ ATALK_BGROUND=no
 # export the charsets, read form ENV by apps
 export ATALK_MAC_CHARSET
 export ATALK_UNIX_CHARSET
+
+# log config for cnid_metad and cnid_dbd
+CNID_DBD_LOGCONFIG="-l default log_note"
\ No newline at end of file

diff --git a/distrib/initscripts/rc.atalk.bsd.tmpl b/distrib/initscripts/rc.atalk.bsd.tmpl
index a24474d2541328299610f671b326f83ebb069655..a6b7249ce5449bcbc334a9084179edb4ea0b5233 100755 (executable)
--- a/distrib/initscripts/rc.atalk.bsd.tmpl
+++ b/distrib/initscripts/rc.atalk.bsd.tmpl
@@ -30,7 +30,7 @@ if [ -x :SBINDIR:/papd ]; then
 fi
 
 if [ -x :SBINDIR:/cnid_metad ]; then
-       :SBINDIR:/cnid_metad;           echo -n ' cnid_metad'
+       :SBINDIR:/cnid_metad "$CNID_DBD_LOGCONFIG";             echo -n ' cnid_metad'
 fi
 
 if [ -x :SBINDIR:/afpd ]; then

diff --git a/distrib/initscripts/rc.atalk.debian.tmpl b/distrib/initscripts/rc.atalk.debian.tmpl
index cbdbe88b055a25c26702d48fc5aa48dcee32f631..777ee3ddf37dc767d7635a2bb467519afa134a80 100644 (file)
--- a/distrib/initscripts/rc.atalk.debian.tmpl
+++ b/distrib/initscripts/rc.atalk.debian.tmpl
@@ -4,7 +4,7 @@
 #
 # Author:       Thomas Kaiser <Thomas.Kaiser@phg-online.de>
 #
-# Version:      $Id: rc.atalk.debian.tmpl,v 1.2 2005-04-28 20:49:37 bfernhomberg Exp $
+# Version:      $Id: rc.atalk.debian.tmpl,v 1.3 2009-03-31 14:08:35 franklahm Exp $
 
 set -e
 
@@ -41,7 +41,7 @@ atalk_startup() {
        # prepare startup of file services
        if [ x"${CNID_METAD_RUN}" = x"yes" -a -x :SBINDIR:/cnid_metad ] ; then
                echo -n " cnid_metad"
-               :SBINDIR:/cnid_metad
+               :SBINDIR:/cnid_metad "$CNID_DBD_LOGCONFIG"
        fi
        
        if [ x"$AFPD_RUN" = x"yes" ]; then

diff --git a/distrib/initscripts/rc.atalk.gentoo.tmpl b/distrib/initscripts/rc.atalk.gentoo.tmpl
index 47bba4ade9646cee96119f4086e33755b03e7025..53d51eb44d621c7bb4028549a9bacc13aa95a2b6 100644 (file)
--- a/distrib/initscripts/rc.atalk.gentoo.tmpl
+++ b/distrib/initscripts/rc.atalk.gentoo.tmpl
@@ -36,7 +36,7 @@ atalk_startup () {
 
        if [ "${CNID_METAD_RUN}" = "yes" ] ; then
                ebegin "Starting cnid_metad"
-               start-stop-daemon --start --quiet --exec :SBINDIR:/cnid_metad
+               start-stop-daemon --start --quiet --exec :SBINDIR:/cnid_metad "$CNID_DBD_LOGCONFIG"
                eend $?
        fi
 

diff --git a/distrib/initscripts/rc.atalk.redhat.tmpl b/distrib/initscripts/rc.atalk.redhat.tmpl
index 96ae2a69d2c9161787de4765e1ba258da24d91d7..658d7631aba6a27798795d3743d483c8c4147e55 100644 (file)
--- a/distrib/initscripts/rc.atalk.redhat.tmpl
+++ b/distrib/initscripts/rc.atalk.redhat.tmpl
@@ -101,7 +101,7 @@ atalk_startup() {
 
     if [ x"${CNID_METAD_RUN}" = x"yes" -a -x ${ATALK_SBIN}/cnid_metad ] ; then
            echo -n "  Starting cnid_metad:"
-           daemon ${ATALK_SBIN}/cnid_metad
+           daemon ${ATALK_SBIN}/cnid_metad "$CNID_DBD_LOGCONFIG"
            RETVAL_CNID_METAD=$?
            echo
     fi

diff --git a/distrib/initscripts/rc.atalk.suse.tmpl b/distrib/initscripts/rc.atalk.suse.tmpl
index 7421d6393091a389c5a59fe26c57eff51d126720..c2d5ef1f777b67c165de10cc1755d8d9c97e7119 100755 (executable)
--- a/distrib/initscripts/rc.atalk.suse.tmpl
+++ b/distrib/initscripts/rc.atalk.suse.tmpl
@@ -58,7 +58,7 @@ atalk_startup() {
 
     if [ x"${CNID_METAD_RUN}" = x"yes" -a -x :SBINDIR:/cnid_metad ] ; then
            echo -n "  Starting cnid_metad:"
-           startproc :SBINDIR:/cnid_metad
+           startproc :SBINDIR:/cnid_metad "$CNID_DBD_LOGCONFIG"
     fi
 
     if [ x"${AFPD_RUN}" = x"yes" -a -x :SBINDIR:/afpd ] ; then

diff --git a/distrib/initscripts/rc.atalk.sysv.tmpl b/distrib/initscripts/rc.atalk.sysv.tmpl
index a774cb0fa31a2642467f1b42b25a015ee8157fe9..14f9c044ece83d61422f45aeb4b8e52ccfc8d8fc 100755 (executable)
--- a/distrib/initscripts/rc.atalk.sysv.tmpl
+++ b/distrib/initscripts/rc.atalk.sysv.tmpl
@@ -50,7 +50,7 @@ atalk_startup() {
        fi
 
        if [ x"${CNID_METAD_RUN}" = x"yes" -a -x :SBINDIR:/cnid_metad ]; then
-               :SBINDIR:/cnid_metad;                   echo ' cnid_metad\c'
+               :SBINDIR:/cnid_metad "$CNID_DBD_LOGCONFIG";                     echo ' cnid_metad\c'
        fi
 
        if [  x"${AFPD_RUN}" = x"yes" -a -x :SBINDIR:/afpd ]; then