Always install dbus-session.conf

diff --git a/config/.gitignore b/config/.gitignore
index 4263f60026fcbfdd86ac9a0e8790068814daf49a..ec0b4097416de6cd166138540731526921984658 100644 (file)
--- a/config/.gitignore
+++ b/config/.gitignore
@@ -2,4 +2,3 @@ Makefile
 Makefile.in
 *.o
 afp.conf
-dbus-session.conf
\ No newline at end of file

diff --git a/config/Makefile.am b/config/Makefile.am
index 79ea6b4f7be01bea3f15ce90e7f139bafe8468df..026887b8e7e2f77f49461c30bd11f04591e8538c 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -3,10 +3,10 @@
 SUBDIRS = pam
 SUFFIXES = .tmpl .
 
-TMPLFILES = afp.conf.tmpl dbus-session.conf.tmpl
-GENFILES = afp.conf dbus-session.conf
+TMPLFILES = afp.conf.tmpl
+GENFILES = afp.conf
 CLEANFILES = $(GENFILES)
-EXTRA_DIST = afp.conf.tmpl extmap.conf dbus-session.conf.tmpl netatalk-dbus.conf tracker.cfg
+EXTRA_DIST = afp.conf.tmpl extmap.conf dbus-session.conf netatalk-dbus.conf tracker.cfg
 
 OVERWRITE_CONFIG = @OVERWRITE_CONFIG@
 
@@ -41,10 +41,11 @@ install-data-local: install-config-files
        $(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(localstatedir)/netatalk/CNID/
 
 uninstall-local:
-       for f in $(CONFFILES) $(GENFILES); do \
+       @for f in $(CONFFILES) $(GENFILES); do \
                echo rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
                rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
        done
+       rm -f $(DESTDIR)$(pkgconfdir)/dbus-session.conf
        rm -f $(DESTDIR)$(localstatedir)/netatalk/README
        rm -f $(DESTDIR)$(localstatedir)/netatalk/CNID/README
 if HAVE_TRACKER_RDF
@@ -56,7 +57,8 @@ endif
 
 install-config-files: $(CONFFILES) $(GENFILES)
        $(mkinstalldirs) $(DESTDIR)$(pkgconfdir)
-       for f in $(CONFFILES) ; do \
+       $(INSTALL_DATA) $(srcdir)/dbus-session.conf $(DESTDIR)$(pkgconfdir)
+       @for f in $(CONFFILES) ; do \
                if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pkgconfdir)/$$f; then \
                        echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)"; \
                        $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(pkgconfdir); \
@@ -64,7 +66,7 @@ install-config-files: $(CONFFILES) $(GENFILES)
                        echo "not overwriting $$f"; \
                fi; \
        done
-       for f in $(GENFILES); do \
+       @for f in $(GENFILES); do \
                if test "x$(OVERWRITE_CONFIG)" = "xyes" -o ! -f $(DESTDIR)$(pkgconfdir)/$$f; then \
                        echo "$(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir)"; \
                        $(INSTALL_DATA) $$f $(DESTDIR)$(pkgconfdir); \

diff --git a/config/dbus-session.conf b/config/dbus-session.conf
new file mode 100644 (file)
index 0000000..e933380
--- /dev/null
+++ b/config/dbus-session.conf
@@ -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=/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
deleted file mode 100644 (file)
index e933380..0000000
--- a/config/dbus-session.conf.tmpl
+++ /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>