Move Spotlight UNIX domain socket to /netatalk/

diff --git a/config/.gitignore b/config/.gitignore
index ec0b4097416de6cd166138540731526921984658..f6ebd89c41505fa9e57e357cdf4895758e34414d 100644 (file)
--- a/config/.gitignore
+++ b/config/.gitignore
@@ -2,3 +2,4 @@ Makefile
 Makefile.in
 *.o
 afp.conf
+dbus-session.conf

diff --git a/config/Makefile.am b/config/Makefile.am
index 6225c165d3a7908b2a768c239584bfb5615790c1..aeb37a07e21dab19f05e7b6eb81193de7936cc63 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -3,10 +3,10 @@
 SUBDIRS = pam
 SUFFIXES = .tmpl .
 
-TMPLFILES = afp.conf.tmpl
-GENFILES = afp.conf
+TMPLFILES = afp.conf.tmpl dbus-session.conf.tmpl
+GENFILES = afp.conf dbus-session.conf
 CLEANFILES = $(GENFILES)
-EXTRA_DIST = afp.conf.tmpl extmap.conf dbus-session.conf netatalk-dbus.conf
+EXTRA_DIST = $(TMPLFILES) extmap.conf netatalk-dbus.conf
 
 OVERWRITE_CONFIG = @OVERWRITE_CONFIG@
 
@@ -28,6 +28,7 @@ endif
            -e s@:ETCDIR:@${pkgconfdir}@ \
            -e s@:COMPILED_BACKENDS:@"$(compiled_backends)"@ \
            -e s@:DEFAULT_CNID_SCHEME:@$(DEFAULT_CNID_SCHEME)@ \
+               -e s@:LOCALSTATEDIR:@"$(localstatedir)"@ \
            <$< >$@
 
 #

diff --git a/config/dbus-session.conf b/config/dbus-session.conf
deleted file mode 100644 (file)
index e933380..0000000
--- a/config/dbus-session.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-  <!-- Our well-known bus type, don't change this -->
-  <type>session</type>
-
-  <!-- If we fork, keep the user's original umask to avoid affecting
-       the behavior of child processes. -->
-  <keep_umask/>
-
-  <listen>unix:path=/tmp/spotlight.ipc</listen>
-
-  <standard_session_servicedirs />
-
-  <policy context="default">
-    <allow user="*"/>
-    <allow own="*"/>
-    <allow send_destination="*" eavesdrop="true"/>
-    <allow receive_sender="*"/>
-    <allow eavesdrop="true"/>
-  </policy>
-
-  <!-- For the session bus, override the default relatively-low limits 
-       with essentially infinite limits, since the bus is just running 
-       as the user anyway, using up bus resources is not something we need 
-       to worry about. In some cases, we do set the limits lower than 
-       "all available memory" if exceeding the limit is almost certainly a bug, 
-       having the bus enforce a limit is nicer than a huge memory leak. But the 
-       intent is that these limits should never be hit. -->
-
-  <!-- the memory limits are 1G instead of say 4G because they can't exceed 32-bit signed int max -->
-  <limit name="max_incoming_bytes">1000000000</limit>
-  <limit name="max_outgoing_bytes">1000000000</limit>
-  <limit name="max_message_size">1000000000</limit>
-  <limit name="service_start_timeout">120000</limit>  
-  <limit name="auth_timeout">240000</limit>
-  <limit name="max_completed_connections">100000</limit>  
-  <limit name="max_incomplete_connections">10000</limit>
-  <limit name="max_connections_per_user">100000</limit>
-  <limit name="max_pending_service_starts">10000</limit>
-  <limit name="max_names_per_connection">50000</limit>
-  <limit name="max_match_rules_per_connection">50000</limit>
-  <limit name="max_replies_per_connection">50000</limit>
-
-</busconfig>

diff --git a/config/dbus-session.conf.tmpl b/config/dbus-session.conf.tmpl
new file mode 100644 (file)
index 0000000..f84b923
--- /dev/null
+++ b/config/dbus-session.conf.tmpl
@@ -0,0 +1,45 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  <!-- Our well-known bus type, don't change this -->
+  <type>session</type>
+
+  <!-- If we fork, keep the user's original umask to avoid affecting
+       the behavior of child processes. -->
+  <keep_umask/>
+
+  <listen>unix:path=:LOCALSTATEDIR:/netatalk/spotlight.ipc</listen>
+
+  <standard_session_servicedirs />
+
+  <policy context="default">
+    <allow user="*"/>
+    <allow own="*"/>
+    <allow send_destination="*" eavesdrop="true"/>
+    <allow receive_sender="*"/>
+    <allow eavesdrop="true"/>
+  </policy>
+
+  <!-- For the session bus, override the default relatively-low limits 
+       with essentially infinite limits, since the bus is just running 
+       as the user anyway, using up bus resources is not something we need 
+       to worry about. In some cases, we do set the limits lower than 
+       "all available memory" if exceeding the limit is almost certainly a bug, 
+       having the bus enforce a limit is nicer than a huge memory leak. But the 
+       intent is that these limits should never be hit. -->
+
+  <!-- the memory limits are 1G instead of say 4G because they can't exceed 32-bit signed int max -->
+  <limit name="max_incoming_bytes">1000000000</limit>
+  <limit name="max_outgoing_bytes">1000000000</limit>
+  <limit name="max_message_size">1000000000</limit>
+  <limit name="service_start_timeout">120000</limit>  
+  <limit name="auth_timeout">240000</limit>
+  <limit name="max_completed_connections">100000</limit>  
+  <limit name="max_incomplete_connections">10000</limit>
+  <limit name="max_connections_per_user">100000</limit>
+  <limit name="max_pending_service_starts">10000</limit>
+  <limit name="max_names_per_connection">50000</limit>
+  <limit name="max_match_rules_per_connection">50000</limit>
+  <limit name="max_replies_per_connection">50000</limit>
+
+</busconfig>

diff --git a/doc/manual/configuration.xml b/doc/manual/configuration.xml
index 51711ad3afba06bf7b96396844bc2d68587f9d46..f82de7359707de0e15d78578f3f3c33c77c046ea 100644 (file)
--- a/doc/manual/configuration.xml
+++ b/doc/manual/configuration.xml
@@ -1579,7 +1579,7 @@ aclmode = passthrough</screen>
 PREFIX="/"
 export XDG_DATA_HOME="$PREFIX/var/netatalk/"
 export XDG_CACHE_HOME="$PREFIX/var/netatalk/"
-export DBUS_SESSION_BUS_ADDRESS="unix:path=/tmp/spotlight.ipc"
+export DBUS_SESSION_BUS_ADDRESS="unix:path=$PREFIX/var/netatalk/spotlight.ipc"
 # . .tracker_profile
 #
 </screen></para>

diff --git a/etc/netatalk/netatalk.c b/etc/netatalk/netatalk.c
index 6923993edf7756ebddcbfb2e8efc5cb642204c50..0e5c6554edcd0464cab4b8373a09f867b3b86ae5 100644 (file)
--- a/etc/netatalk/netatalk.c
+++ b/etc/netatalk/netatalk.c
@@ -395,7 +395,7 @@ int main(int argc, char **argv)
     sigprocmask(SIG_SETMASK, &blocksigs, NULL);
 
 #ifdef HAVE_TRACKER
-    setenv("DBUS_SESSION_BUS_ADDRESS", "unix:path=/tmp/spotlight.ipc", 1);
+    setenv("DBUS_SESSION_BUS_ADDRESS", "unix:path=" _PATH_STATEDIR "spotlight.ipc", 1);
     setenv("XDG_DATA_HOME", _PATH_STATEDIR, 0);
     setenv("XDG_CACHE_HOME", _PATH_STATEDIR, 0);
     setenv("TRACKER_USE_LOG_FILES", "1", 0);

diff --git a/etc/spotlight/Makefile.am b/etc/spotlight/Makefile.am
index 40cde73425a6a815ff208dd7abe00b89f00140dd..7fd2721a4709f3de995e9766b9dc0b93d3978d63 100644 (file)
--- a/etc/spotlight/Makefile.am
+++ b/etc/spotlight/Makefile.am
@@ -20,7 +20,12 @@ slmod_sparql_la_SOURCES = \
        slmod_sparql_parser.y \
        spotlight_rawquery_lexer.l
 
-slmod_sparql_la_CFLAGS  = -DDBUS_API_SUBJECT_TO_CHANGE @TRACKER_CFLAGS@ @TRACKER_MINER_CFLAGS@
+slmod_sparql_la_CFLAGS  = \
+       -DDBUS_API_SUBJECT_TO_CHANGE \
+       @TRACKER_CFLAGS@ \
+       @TRACKER_MINER_CFLAGS@ \
+       -D_PATH_STATEDIR='"$(localstatedir)/netatalk"'
+
 slmod_sparql_la_LDFLAGS = -module -avoid-version @TRACKER_LIBS@ @TRACKER_MINER_LIBS@
 
 srp_SOURCES = \

diff --git a/etc/spotlight/slmod_sparql.c b/etc/spotlight/slmod_sparql.c
index 00ed90d6a35f615205d031ea82e55bf57033a0a9..099aa964ca7073e38319b69f6224531afd837437 100644 (file)
--- a/etc/spotlight/slmod_sparql.c
+++ b/etc/spotlight/slmod_sparql.c
@@ -62,7 +62,7 @@ static int sl_mod_init(void *p)
     LOG(log_info, logtype_sl, "Initializing Spotlight module");
 
     g_type_init();
-    setenv("DBUS_SESSION_BUS_ADDRESS", "unix:path=/tmp/spotlight.ipc", 1);
+    setenv("DBUS_SESSION_BUS_ADDRESS", "unix:path=" _PATH_STATEDIR "/spotlight.ipc", 1);
     setenv("TRACKER_SPARQL_BACKEND", "bus", 1);
 
 #ifdef DEBUG