From c438f9a125450a4c5da252f8172411f0b55ceef3 Mon Sep 17 00:00:00 2001 From: Ralph Boehme Date: Thu, 22 May 2014 13:16:02 +0200 Subject: [PATCH] New options that control whether dbus and Tracker are started 'start dbus' and 'start tracker', both default to yes, FR#91 Signed-off-by: Ralph Boehme --- NEWS | 2 ++ doc/manpages/man5/afp.conf.5.xml | 21 ++++++++++++++++++++ etc/netatalk/netatalk.c | 34 +++++++++++++++----------------- man/man5/afp.conf.5.in | 11 +++++++++++ 4 files changed, 50 insertions(+), 18 deletions(-) diff --git a/NEWS b/NEWS index f6fd71a1..c465335e 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,8 @@ Changes in 3.1.2 definitions. FR#90. * FIX: getvolbypath returns incorrect volume, bug #563 * FIX: fd leak when using appledouble = v2, bug #554 +* UPD: New options that control whether dbus and Tracker are started: + 'start dbus' and 'start tracker', both default to yes, FR#91 Changes in 3.1.1 ================ diff --git a/doc/manpages/man5/afp.conf.5.xml b/doc/manpages/man5/afp.conf.5.xml index b6094c4e..a1e760a1 100644 --- a/doc/manpages/man5/afp.conf.5.xml +++ b/doc/manpages/man5/afp.conf.5.xml @@ -1003,6 +1003,27 @@ + + start dbus = + BOOLEAN (default: + yes) (G) + + + Whether to start a dbus instance for use with Tracker. + + + + + start tracker = + BOOLEAN (default: + yes) (G) + + + Whether to start Tracker with + tracker-control -s. + + + veto message = BOOLEAN (default: no) (G) diff --git a/etc/netatalk/netatalk.c b/etc/netatalk/netatalk.c index 1e5e7394..1ce7befc 100644 --- a/etc/netatalk/netatalk.c +++ b/etc/netatalk/netatalk.c @@ -418,28 +418,26 @@ int main(int argc, char **argv) setenv("XDG_CACHE_HOME", _PATH_STATEDIR, 0); setenv("TRACKER_USE_LOG_FILES", "1", 0); - dbus_path = atalk_iniparser_getstring(obj.iniconfig, INISEC_GLOBAL, "dbus daemon", DBUS_DAEMON_PATH); - LOG(log_debug, logtype_default, "DBUS: '%s'", dbus_path); - if ((dbus_pid = run_process(dbus_path, "--config-file=" _PATH_CONFDIR "dbus-session.conf", NULL)) == NETATALK_SRV_ERROR) { - LOG(log_error, logtype_default, "Error starting '%s'", dbus_path); - netatalk_exit(EXITERR_CONF); + if (atalk_iniparser_getboolean(obj.iniconfig, INISEC_GLOBAL, "start dbus", 1)) { + dbus_path = atalk_iniparser_getstring(obj.iniconfig, INISEC_GLOBAL, "dbus daemon", DBUS_DAEMON_PATH); + LOG(log_debug, logtype_default, "DBUS: '%s'", dbus_path); + if ((dbus_pid = run_process(dbus_path, "--config-file=" _PATH_CONFDIR "dbus-session.conf", NULL)) == NETATALK_SRV_ERROR) { + LOG(log_error, logtype_default, "Error starting '%s'", dbus_path); + netatalk_exit(EXITERR_CONF); + } + + /* Allow dbus some time to start up */ + sleep(1); } - /* Allow dbus some time to start up */ - sleep(1); -#endif - -#ifdef HAVE_TRACKER_SPARQL -#ifdef SOLARIS - setenv("XDG_DATA_DIRS", TRACKER_PREFIX "/share", 0); - setenv("TRACKER_DB_ONTOLOGIES_DIR", TRACKER_PREFIX "/share/tracker/ontologies", 0); - setenv("TRACKER_EXTRACTOR_RULES_DIR", TRACKER_PREFIX "/share/tracker/extract-rules", 0); - setenv("TRACKER_LANGUAGE_STOPWORDS_DIR", TRACKER_PREFIX "/share/tracker/languages", 0); -#endif set_sl_volumes(); - system(TRACKER_PREFIX "/bin/tracker-control -s"); -#endif + + if (atalk_iniparser_getboolean(obj.iniconfig, INISEC_GLOBAL, "start tracker", 1)) { + system(TRACKER_PREFIX "/bin/tracker-control -s"); + } } +#endif + /* run the event loop */ ret = event_base_dispatch(base); diff --git a/man/man5/afp.conf.5.in b/man/man5/afp.conf.5.in index 723cf689..e50d634c 100644 --- a/man/man5/afp.conf.5.in +++ b/man/man5/afp.conf.5.in @@ -638,6 +638,17 @@ Whether to enable Spotlight searches\&. Note: once the global option is enabled, option\&. .RE .PP +start dbus = \fIBOOLEAN\fR (default: \fIyes\fR) \fB(G)\fR +.RS 4 +Whether to start a dbus instance for use with Tracker\&. +.RE +.PP +start tracker = \fIBOOLEAN\fR (default: \fIyes\fR) \fB(G)\fR +.RS 4 +Whether to start Tracker with +\fItracker\-control \-s\fR\&. +.RE +.PP veto message = \fIBOOLEAN\fR (default: \fIno\fR) \fB(G)\fR .RS 4 Send optional AFP messages for vetoed files\&. Then whenever a client tries to access any file or directory with a vetoed name, it will be sent an AFP message indicating the name and the directory\&. -- 2.39.2