summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac19
-rw-r--r--src/ats/ats.conf.in2
-rw-r--r--src/consensus/consensus.conf.in2
-rw-r--r--src/conversation/conversation.conf.in2
-rw-r--r--src/core/core.conf.in2
-rw-r--r--src/datastore/datastore.conf.in2
-rw-r--r--src/dht/dht.conf.in2
-rw-r--r--src/dns/dns.conf.in2
-rw-r--r--src/dv/dv.conf.in2
-rw-r--r--src/fs/fs.conf.in2
-rw-r--r--src/gns/gns.conf.in2
-rw-r--r--src/identity/identity.conf.in2
-rw-r--r--src/mesh/mesh.conf.in2
-rw-r--r--src/multicast/multicast.conf.in2
-rw-r--r--src/namecache/namecache.conf.in2
-rw-r--r--src/namestore/namestore.conf.in2
-rw-r--r--src/nse/nse.conf.in2
-rw-r--r--src/peerinfo/peerinfo.conf.in2
-rw-r--r--src/psyc/psyc.conf.in2
-rw-r--r--src/psycstore/psycstore.conf.in2
-rw-r--r--src/regex/regex.conf.in2
-rw-r--r--src/revocation/revocation.conf.in2
-rw-r--r--src/statistics/statistics.conf.in2
-rw-r--r--src/transport/transport.conf.in2
-rw-r--r--src/util/resolver.conf.in2
-rw-r--r--src/vpn/vpn.conf.in2
26 files changed, 44 insertions, 25 deletions
diff --git a/configure.ac b/configure.ac
index 50169797e..4ae54482d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1158,6 +1158,25 @@ AC_ARG_ENABLE([experimental],
AC_MSG_RESULT($enable_experimental)
AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "xyes"])
+# should services be started by default when a peer starts? Some services may
+# choose to never start by default and it is upto the service/module developer to
+# decide it by having "AUTOSTART = NO" instead of "AUTOSTART = @AUTOSTART" in
+# the service/module's conf.in file.
+AUTOSTART="YES"
+AC_MSG_CHECKING(whether to auto-start peer's services by default)
+AC_ARG_ENABLE([autostart],
+ [AS_HELP_STRING([--disable-autostart], [do not start peer's services by default])],
+ [enable_autostart=${enableval}
+ if test "x$enable_autostart" == "xno"
+ then
+ AUTOSTART="NO"
+ fi
+ ],
+ [enable_autostart=yes])
+AC_MSG_RESULT($enable_autostart)
+#AM_CONDITIONAL([HAVE_AUTOSTART], [test "x$enable_autostart" = "xyes"])
+AC_SUBST(AUTOSTART)
+
# should memory statistics be kept (very expensive CPU-wise!)
AC_MSG_CHECKING(whether to create expensive statistics on memory use)
AC_ARG_ENABLE([heapstats],
diff --git a/src/ats/ats.conf.in b/src/ats/ats.conf.in
index 8a87f69ee..589ee6802 100644
--- a/src/ats/ats.conf.in
+++ b/src/ats/ats.conf.in
@@ -1,5 +1,5 @@
[ats]
-AUTOSTART = YES
+AUTOSTART = @AUTOSTART@
@UNIXONLY@ PORT = 2098
HOSTNAME = localhost
BINARY = gnunet-service-ats
diff --git a/src/consensus/consensus.conf.in b/src/consensus/consensus.conf.in
index e34e7cb57..2afee04db 100644
--- a/src/consensus/consensus.conf.in
+++ b/src/consensus/consensus.conf.in
@@ -1,5 +1,5 @@
[consensus]
-AUTOSTART = YES
+AUTOSTART = @AUTOSTART@
@JAVAPORT@PORT = 2103
HOSTNAME = localhost
BINARY = gnunet-service-consensus
diff --git a/src/conversation/conversation.conf.in b/src/conversation/conversation.conf.in
index 48d2dc507..06db35e08 100644
--- a/src/conversation/conversation.conf.in
+++ b/src/conversation/conversation.conf.in
@@ -1,5 +1,5 @@
[conversation]
-AUTOSTART = YES
+AUTOSTART = @AUTOSTART@
BINARY = gnunet-service-conversation
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-conversation.sock
@UNIXONLY@ PORT = 2106
diff --git a/src/core/core.conf.in b/src/core/core.conf.in
index fbf206d20..c4f18468c 100644
--- a/src/core/core.conf.in
+++ b/src/core/core.conf.in
@@ -1,5 +1,5 @@
[core]
-AUTOSTART = YES
+AUTOSTART = @AUTOSTART@
@JAVAPORT@PORT = 2092
HOSTNAME = localhost
BINARY = gnunet-service-core
diff --git a/src/datastore/datastore.conf.in b/src/datastore/datastore.conf.in
index 35098bbce..b6b7c13bc 100644
--- a/src/datastore/datastore.conf.in
+++ b/src/datastore/datastore.conf.in
@@ -1,5 +1,5 @@
[datastore]
-AUTOSTART = YES
+AUTOSTART = @AUTOSTART@
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-datastore.sock
UNIX_MATCH_UID = NO
UNIX_MATCH_GID = YES
diff --git a/src/dht/dht.conf.in b/src/dht/dht.conf.in
index bab1191d4..c8cf84386 100644
--- a/src/dht/dht.conf.in
+++ b/src/dht/dht.conf.in
@@ -1,5 +1,5 @@
[dht]
-AUTOSTART = YES
+AUTOSTART = @AUTOSTART@
@JAVAPORT@PORT = 2095
HOSTNAME = localhost
BINARY = gnunet-service-dht
diff --git a/src/dns/dns.conf.in b/src/dns/dns.conf.in
index f97b8f0ff..4f87845b1 100644
--- a/src/dns/dns.conf.in
+++ b/src/dns/dns.conf.in
@@ -1,5 +1,5 @@
[dns]
-AUTOSTART = YES
+AUTOSTART = @AUTOSTART@
HOSTNAME = localhost
BINARY = gnunet-service-dns
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-dns.sock
diff --git a/src/dv/dv.conf.in b/src/dv/dv.conf.in
index d044740ce..5d9a960f5 100644
--- a/src/dv/dv.conf.in
+++ b/src/dv/dv.conf.in
@@ -1,5 +1,5 @@
[dv]
-AUTOSTART = YES
+AUTOSTART = @AUTOSTART@
ACCEPT_FROM6 = ::1;
ACCEPT_FROM = 127.0.0.1;
BINARY = gnunet-service-dv
diff --git a/src/fs/fs.conf.in b/src/fs/fs.conf.in
index 087185b0c..30de93a5f 100644
--- a/src/fs/fs.conf.in
+++ b/src/fs/fs.conf.in
@@ -1,5 +1,5 @@
[fs]
-AUTOSTART = YES
+AUTOSTART = @AUTOSTART@
INDEXDB = $GNUNET_DATA_HOME/fs/idxinfo.lst
RESPECT = $GNUNET_DATA_HOME/fs/credit/
STATE_DIR = $GNUNET_DATA_HOME/fs/persistence/
diff --git a/src/gns/gns.conf.in b/src/gns/gns.conf.in
index c685a2146..e600871fc 100644
--- a/src/gns/gns.conf.in
+++ b/src/gns/gns.conf.in
@@ -1,5 +1,5 @@
[gns]
-AUTOSTART = YES
+AUTOSTART = @AUTOSTART@
HOSTNAME = localhost
BINARY = gnunet-service-gns
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-gns.sock
diff --git a/src/identity/identity.conf.in b/src/identity/identity.conf.in
index da46794df..19efd4aa6 100644
--- a/src/identity/identity.conf.in
+++ b/src/identity/identity.conf.in
@@ -1,5 +1,5 @@
[identity]
-AUTOSTART = YES
+AUTOSTART = @AUTOSTART@
USER_SERVICE = YES
@JAVAPORT@PORT = 2108
HOSTNAME = localhost
diff --git a/src/mesh/mesh.conf.in b/src/mesh/mesh.conf.in
index cb061bd70..b5a4016d0 100644
--- a/src/mesh/mesh.conf.in
+++ b/src/mesh/mesh.conf.in
@@ -1,5 +1,5 @@
[mesh]
-AUTOSTART = YES
+AUTOSTART = @AUTOSTART@
@JAVAPORT@PORT = 2096
HOSTNAME = localhost
BINARY = gnunet-service-mesh
diff --git a/src/multicast/multicast.conf.in b/src/multicast/multicast.conf.in
index 305893b00..dab90c7eb 100644
--- a/src/multicast/multicast.conf.in
+++ b/src/multicast/multicast.conf.in
@@ -1,5 +1,5 @@
[multicast]
-AUTOSTART = YES
+AUTOSTART = @AUTOSTART@
PORT = 2109
HOSTNAME = localhost
BINARY = gnunet-service-multicast
diff --git a/src/namecache/namecache.conf.in b/src/namecache/namecache.conf.in
index cb952d0b7..31cd22ec7 100644
--- a/src/namecache/namecache.conf.in
+++ b/src/namecache/namecache.conf.in
@@ -1,5 +1,5 @@
[namecache]
-AUTOSTART = YES
+AUTOSTART = @AUTOSTART@
USER_SERVICE = NO
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-namecache.sock
UNIX_MATCH_UID = NO
diff --git a/src/namestore/namestore.conf.in b/src/namestore/namestore.conf.in
index 6c96b0737..a5fde1a85 100644
--- a/src/namestore/namestore.conf.in
+++ b/src/namestore/namestore.conf.in
@@ -1,5 +1,5 @@
[namestore]
-AUTOSTART = YES
+AUTOSTART = @AUTOSTART@
USER_SERVICE = YES
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-namestore.sock
UNIX_MATCH_UID = NO
diff --git a/src/nse/nse.conf.in b/src/nse/nse.conf.in
index ecae4641c..7930992df 100644
--- a/src/nse/nse.conf.in
+++ b/src/nse/nse.conf.in
@@ -1,5 +1,5 @@
[nse]
-AUTOSTART = YES
+AUTOSTART = @AUTOSTART@
@JAVAPORT@PORT = 2097
HOSTNAME = localhost
BINARY = gnunet-service-nse
diff --git a/src/peerinfo/peerinfo.conf.in b/src/peerinfo/peerinfo.conf.in
index 3233c44d7..8615a8866 100644
--- a/src/peerinfo/peerinfo.conf.in
+++ b/src/peerinfo/peerinfo.conf.in
@@ -1,5 +1,5 @@
[peerinfo]
-AUTOSTART = YES
+AUTOSTART = @AUTOSTART@
@JAVAPORT@PORT = 2090
HOSTNAME = localhost
BINARY = gnunet-service-peerinfo
diff --git a/src/psyc/psyc.conf.in b/src/psyc/psyc.conf.in
index d1f5abe6d..30984fb29 100644
--- a/src/psyc/psyc.conf.in
+++ b/src/psyc/psyc.conf.in
@@ -1,5 +1,5 @@
[psyc]
-AUTOSTART = YES
+AUTOSTART = @AUTOSTART@
BINARY = gnunet-service-psyc
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-psyc.sock
UNIX_MATCH_UID = NO
diff --git a/src/psycstore/psycstore.conf.in b/src/psycstore/psycstore.conf.in
index 4af03bbd0..5e44a1a1e 100644
--- a/src/psycstore/psycstore.conf.in
+++ b/src/psycstore/psycstore.conf.in
@@ -1,5 +1,5 @@
[psycstore]
-AUTOSTART = YES
+AUTOSTART = @AUTOSTART@
BINARY = gnunet-service-psycstore
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-psycstore.sock
@UNIXONLY@PORT = 2111
diff --git a/src/regex/regex.conf.in b/src/regex/regex.conf.in
index 26768347f..8a75881f9 100644
--- a/src/regex/regex.conf.in
+++ b/src/regex/regex.conf.in
@@ -1,5 +1,5 @@
[regex]
-AUTOSTART = YES
+AUTOSTART = @AUTOSTART@
@UNIXONLY@ PORT = 2107
UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-regex.sock
HOSTNAME = localhost
diff --git a/src/revocation/revocation.conf.in b/src/revocation/revocation.conf.in
index e9335cd29..9718b68e4 100644
--- a/src/revocation/revocation.conf.in
+++ b/src/revocation/revocation.conf.in
@@ -1,5 +1,5 @@
[revocation]
-AUTOSTART = YES
+AUTOSTART = @AUTOSTART@
@JAVAPORT@PORT = 2112
HOSTNAME = localhost
BINARY = gnunet-service-revocation
diff --git a/src/statistics/statistics.conf.in b/src/statistics/statistics.conf.in
index c7d303782..2d0011372 100644
--- a/src/statistics/statistics.conf.in
+++ b/src/statistics/statistics.conf.in
@@ -1,5 +1,5 @@
[statistics]
-AUTOSTART = YES
+AUTOSTART = @AUTOSTART@
@JAVAPORT@PORT = 2088
HOSTNAME = localhost
BINARY = gnunet-service-statistics
diff --git a/src/transport/transport.conf.in b/src/transport/transport.conf.in
index f5d4021a3..14867c572 100644
--- a/src/transport/transport.conf.in
+++ b/src/transport/transport.conf.in
@@ -1,5 +1,5 @@
[transport]
-AUTOSTART = YES
+AUTOSTART = @AUTOSTART@
@JAVAPORT@PORT = 2091
HOSTNAME = localhost
BINARY = gnunet-service-transport
diff --git a/src/util/resolver.conf.in b/src/util/resolver.conf.in
index 8066c42c1..9c5df32bc 100644
--- a/src/util/resolver.conf.in
+++ b/src/util/resolver.conf.in
@@ -1,5 +1,5 @@
[resolver]
-AUTOSTART = YES
+AUTOSTART = @AUTOSTART@
@JAVAPORT@PORT = 2089
HOSTNAME = localhost
BINARY = gnunet-service-resolver
diff --git a/src/vpn/vpn.conf.in b/src/vpn/vpn.conf.in
index 5a850deae..000300084 100644
--- a/src/vpn/vpn.conf.in
+++ b/src/vpn/vpn.conf.in
@@ -1,5 +1,5 @@
[vpn]
-AUTOSTART = YES
+AUTOSTART = @AUTOSTART@
@UNIXONLY@ PORT = 2105
HOSTNAME = localhost
BINARY = gnunet-service-vpn