From f491ac4fab469421986f77df0bbf79fefc417786 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 13 Jan 2012 17:04:35 +0000
Subject: change default configurations on systems with UNIX domain sockets to
 NOT specify any port for TCP-based IPC (and interpret that as no TCP-based
 IPC desired), as we can and want to use UNIX domain sockets in this case by
 default

---
 src/dht/Makefile.am |  2 +-
 src/dht/dht.conf    | 38 --------------------------------------
 src/dht/dht.conf.in | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 39 deletions(-)
 delete mode 100644 src/dht/dht.conf
 create mode 100644 src/dht/dht.conf.in

(limited to 'src/dht')

diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index e5d3c88ed..f9766a227 100644
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -7,7 +7,7 @@ plugindir = $(libdir)/gnunet
 
 pkgcfgdir= $(pkgdatadir)/config.d/
 
-dist_pkgcfg_DATA = \
+pkgcfg_DATA = \
   dht.conf 
 
 if HAVE_ZLIB
diff --git a/src/dht/dht.conf b/src/dht/dht.conf
deleted file mode 100644
index ba903a2d0..000000000
--- a/src/dht/dht.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-[dht]
-AUTOSTART = YES
-PORT = 2095
-HOSTNAME = localhost
-HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
-BINARY = gnunet-service-dht
-ACCEPT_FROM = 127.0.0.1;
-ACCEPT_FROM6 = ::1;
-BUCKET_SIZE = 4
-UNIXPATH = /tmp/gnunet-service-dht.sock
-UNIX_MATCH_UID = YES
-UNIX_MATCH_GID = YES
-# DISABLE_SOCKET_FORWARDING = NO
-# DEBUG = YES
-# USERNAME = 
-# MAXBUF =
-# TIMEOUT =
-# DISABLEV6 =
-# BINDTO =
-# REJECT_FROM =
-# REJECT_FROM6 =
-# PREFIX =
-# DO_FIND_PEER =
-# STRICT_KADEMLIA =
-# USE_MAX_HOPS =
-# MAX_HOPS =
-# REPUBLISH = YES
-# REPLICATION_FREQUENCY = 60 
-# STOP_ON_CLOSEST =
-# STOP_FOUND =
-# CONVERGE_MODIFIER =
-
-
-[dhtcache]
-DATABASE = sqlite
-QUOTA = 1 MB
-
diff --git a/src/dht/dht.conf.in b/src/dht/dht.conf.in
new file mode 100644
index 000000000..c73c05688
--- /dev/null
+++ b/src/dht/dht.conf.in
@@ -0,0 +1,38 @@
+[dht]
+AUTOSTART = YES
+@UNIXONLY@ PORT = 2095
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-dht
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+BUCKET_SIZE = 4
+UNIXPATH = /tmp/gnunet-service-dht.sock
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+# DISABLE_SOCKET_FORWARDING = NO
+# DEBUG = YES
+# USERNAME = 
+# MAXBUF =
+# TIMEOUT =
+# DISABLEV6 =
+# BINDTO =
+# REJECT_FROM =
+# REJECT_FROM6 =
+# PREFIX =
+# DO_FIND_PEER =
+# STRICT_KADEMLIA =
+# USE_MAX_HOPS =
+# MAX_HOPS =
+# REPUBLISH = YES
+# REPLICATION_FREQUENCY = 60 
+# STOP_ON_CLOSEST =
+# STOP_FOUND =
+# CONVERGE_MODIFIER =
+
+
+[dhtcache]
+DATABASE = sqlite
+QUOTA = 1 MB
+
-- 
cgit v1.2.3