diff options
-rw-r--r-- | configure.ac | 19 | ||||
-rw-r--r-- | src/ats/ats.conf.in | 2 | ||||
-rw-r--r-- | src/consensus/consensus.conf.in | 2 | ||||
-rw-r--r-- | src/conversation/conversation.conf.in | 2 | ||||
-rw-r--r-- | src/core/core.conf.in | 2 | ||||
-rw-r--r-- | src/datastore/datastore.conf.in | 2 | ||||
-rw-r--r-- | src/dht/dht.conf.in | 2 | ||||
-rw-r--r-- | src/dns/dns.conf.in | 2 | ||||
-rw-r--r-- | src/dv/dv.conf.in | 2 | ||||
-rw-r--r-- | src/fs/fs.conf.in | 2 | ||||
-rw-r--r-- | src/gns/gns.conf.in | 2 | ||||
-rw-r--r-- | src/identity/identity.conf.in | 2 | ||||
-rw-r--r-- | src/mesh/mesh.conf.in | 2 | ||||
-rw-r--r-- | src/multicast/multicast.conf.in | 2 | ||||
-rw-r--r-- | src/namecache/namecache.conf.in | 2 | ||||
-rw-r--r-- | src/namestore/namestore.conf.in | 2 | ||||
-rw-r--r-- | src/nse/nse.conf.in | 2 | ||||
-rw-r--r-- | src/peerinfo/peerinfo.conf.in | 2 | ||||
-rw-r--r-- | src/psyc/psyc.conf.in | 2 | ||||
-rw-r--r-- | src/psycstore/psycstore.conf.in | 2 | ||||
-rw-r--r-- | src/regex/regex.conf.in | 2 | ||||
-rw-r--r-- | src/revocation/revocation.conf.in | 2 | ||||
-rw-r--r-- | src/statistics/statistics.conf.in | 2 | ||||
-rw-r--r-- | src/transport/transport.conf.in | 2 | ||||
-rw-r--r-- | src/util/resolver.conf.in | 2 | ||||
-rw-r--r-- | src/vpn/vpn.conf.in | 2 |
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], | |||
1158 | AC_MSG_RESULT($enable_experimental) | 1158 | AC_MSG_RESULT($enable_experimental) |
1159 | AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "xyes"]) | 1159 | AM_CONDITIONAL([HAVE_EXPERIMENTAL], [test "x$enable_experimental" = "xyes"]) |
1160 | 1160 | ||
1161 | # should services be started by default when a peer starts? Some services may | ||
1162 | # choose to never start by default and it is upto the service/module developer to | ||
1163 | # decide it by having "AUTOSTART = NO" instead of "AUTOSTART = @AUTOSTART" in | ||
1164 | # the service/module's conf.in file. | ||
1165 | AUTOSTART="YES" | ||
1166 | AC_MSG_CHECKING(whether to auto-start peer's services by default) | ||
1167 | AC_ARG_ENABLE([autostart], | ||
1168 | [AS_HELP_STRING([--disable-autostart], [do not start peer's services by default])], | ||
1169 | [enable_autostart=${enableval} | ||
1170 | if test "x$enable_autostart" == "xno" | ||
1171 | then | ||
1172 | AUTOSTART="NO" | ||
1173 | fi | ||
1174 | ], | ||
1175 | [enable_autostart=yes]) | ||
1176 | AC_MSG_RESULT($enable_autostart) | ||
1177 | #AM_CONDITIONAL([HAVE_AUTOSTART], [test "x$enable_autostart" = "xyes"]) | ||
1178 | AC_SUBST(AUTOSTART) | ||
1179 | |||
1161 | # should memory statistics be kept (very expensive CPU-wise!) | 1180 | # should memory statistics be kept (very expensive CPU-wise!) |
1162 | AC_MSG_CHECKING(whether to create expensive statistics on memory use) | 1181 | AC_MSG_CHECKING(whether to create expensive statistics on memory use) |
1163 | AC_ARG_ENABLE([heapstats], | 1182 | 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 @@ | |||
1 | [ats] | 1 | [ats] |
2 | AUTOSTART = YES | 2 | AUTOSTART = @AUTOSTART@ |
3 | @UNIXONLY@ PORT = 2098 | 3 | @UNIXONLY@ PORT = 2098 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | BINARY = gnunet-service-ats | 5 | 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 @@ | |||
1 | [consensus] | 1 | [consensus] |
2 | AUTOSTART = YES | 2 | AUTOSTART = @AUTOSTART@ |
3 | @JAVAPORT@PORT = 2103 | 3 | @JAVAPORT@PORT = 2103 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | BINARY = gnunet-service-consensus | 5 | 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 @@ | |||
1 | [conversation] | 1 | [conversation] |
2 | AUTOSTART = YES | 2 | AUTOSTART = @AUTOSTART@ |
3 | BINARY = gnunet-service-conversation | 3 | BINARY = gnunet-service-conversation |
4 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-conversation.sock | 4 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-conversation.sock |
5 | @UNIXONLY@ PORT = 2106 | 5 | @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 @@ | |||
1 | [core] | 1 | [core] |
2 | AUTOSTART = YES | 2 | AUTOSTART = @AUTOSTART@ |
3 | @JAVAPORT@PORT = 2092 | 3 | @JAVAPORT@PORT = 2092 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | BINARY = gnunet-service-core | 5 | 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 @@ | |||
1 | [datastore] | 1 | [datastore] |
2 | AUTOSTART = YES | 2 | AUTOSTART = @AUTOSTART@ |
3 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-datastore.sock | 3 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-datastore.sock |
4 | UNIX_MATCH_UID = NO | 4 | UNIX_MATCH_UID = NO |
5 | UNIX_MATCH_GID = YES | 5 | 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 @@ | |||
1 | [dht] | 1 | [dht] |
2 | AUTOSTART = YES | 2 | AUTOSTART = @AUTOSTART@ |
3 | @JAVAPORT@PORT = 2095 | 3 | @JAVAPORT@PORT = 2095 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | BINARY = gnunet-service-dht | 5 | 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 @@ | |||
1 | [dns] | 1 | [dns] |
2 | AUTOSTART = YES | 2 | AUTOSTART = @AUTOSTART@ |
3 | HOSTNAME = localhost | 3 | HOSTNAME = localhost |
4 | BINARY = gnunet-service-dns | 4 | BINARY = gnunet-service-dns |
5 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-dns.sock | 5 | 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 @@ | |||
1 | [dv] | 1 | [dv] |
2 | AUTOSTART = YES | 2 | AUTOSTART = @AUTOSTART@ |
3 | ACCEPT_FROM6 = ::1; | 3 | ACCEPT_FROM6 = ::1; |
4 | ACCEPT_FROM = 127.0.0.1; | 4 | ACCEPT_FROM = 127.0.0.1; |
5 | BINARY = gnunet-service-dv | 5 | 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 @@ | |||
1 | [fs] | 1 | [fs] |
2 | AUTOSTART = YES | 2 | AUTOSTART = @AUTOSTART@ |
3 | INDEXDB = $GNUNET_DATA_HOME/fs/idxinfo.lst | 3 | INDEXDB = $GNUNET_DATA_HOME/fs/idxinfo.lst |
4 | RESPECT = $GNUNET_DATA_HOME/fs/credit/ | 4 | RESPECT = $GNUNET_DATA_HOME/fs/credit/ |
5 | STATE_DIR = $GNUNET_DATA_HOME/fs/persistence/ | 5 | 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 @@ | |||
1 | [gns] | 1 | [gns] |
2 | AUTOSTART = YES | 2 | AUTOSTART = @AUTOSTART@ |
3 | HOSTNAME = localhost | 3 | HOSTNAME = localhost |
4 | BINARY = gnunet-service-gns | 4 | BINARY = gnunet-service-gns |
5 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-gns.sock | 5 | 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 @@ | |||
1 | [identity] | 1 | [identity] |
2 | AUTOSTART = YES | 2 | AUTOSTART = @AUTOSTART@ |
3 | USER_SERVICE = YES | 3 | USER_SERVICE = YES |
4 | @JAVAPORT@PORT = 2108 | 4 | @JAVAPORT@PORT = 2108 |
5 | HOSTNAME = localhost | 5 | 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 @@ | |||
1 | [mesh] | 1 | [mesh] |
2 | AUTOSTART = YES | 2 | AUTOSTART = @AUTOSTART@ |
3 | @JAVAPORT@PORT = 2096 | 3 | @JAVAPORT@PORT = 2096 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | BINARY = gnunet-service-mesh | 5 | 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 @@ | |||
1 | [multicast] | 1 | [multicast] |
2 | AUTOSTART = YES | 2 | AUTOSTART = @AUTOSTART@ |
3 | PORT = 2109 | 3 | PORT = 2109 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | BINARY = gnunet-service-multicast | 5 | 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 @@ | |||
1 | [namecache] | 1 | [namecache] |
2 | AUTOSTART = YES | 2 | AUTOSTART = @AUTOSTART@ |
3 | USER_SERVICE = NO | 3 | USER_SERVICE = NO |
4 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-namecache.sock | 4 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-namecache.sock |
5 | UNIX_MATCH_UID = NO | 5 | 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 @@ | |||
1 | [namestore] | 1 | [namestore] |
2 | AUTOSTART = YES | 2 | AUTOSTART = @AUTOSTART@ |
3 | USER_SERVICE = YES | 3 | USER_SERVICE = YES |
4 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-namestore.sock | 4 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-namestore.sock |
5 | UNIX_MATCH_UID = NO | 5 | 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 @@ | |||
1 | [nse] | 1 | [nse] |
2 | AUTOSTART = YES | 2 | AUTOSTART = @AUTOSTART@ |
3 | @JAVAPORT@PORT = 2097 | 3 | @JAVAPORT@PORT = 2097 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | BINARY = gnunet-service-nse | 5 | 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 @@ | |||
1 | [peerinfo] | 1 | [peerinfo] |
2 | AUTOSTART = YES | 2 | AUTOSTART = @AUTOSTART@ |
3 | @JAVAPORT@PORT = 2090 | 3 | @JAVAPORT@PORT = 2090 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | BINARY = gnunet-service-peerinfo | 5 | 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 @@ | |||
1 | [psyc] | 1 | [psyc] |
2 | AUTOSTART = YES | 2 | AUTOSTART = @AUTOSTART@ |
3 | BINARY = gnunet-service-psyc | 3 | BINARY = gnunet-service-psyc |
4 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-psyc.sock | 4 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-psyc.sock |
5 | UNIX_MATCH_UID = NO | 5 | 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 @@ | |||
1 | [psycstore] | 1 | [psycstore] |
2 | AUTOSTART = YES | 2 | AUTOSTART = @AUTOSTART@ |
3 | BINARY = gnunet-service-psycstore | 3 | BINARY = gnunet-service-psycstore |
4 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-psycstore.sock | 4 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-psycstore.sock |
5 | @UNIXONLY@PORT = 2111 | 5 | @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 @@ | |||
1 | [regex] | 1 | [regex] |
2 | AUTOSTART = YES | 2 | AUTOSTART = @AUTOSTART@ |
3 | @UNIXONLY@ PORT = 2107 | 3 | @UNIXONLY@ PORT = 2107 |
4 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-regex.sock | 4 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-regex.sock |
5 | HOSTNAME = localhost | 5 | 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 @@ | |||
1 | [revocation] | 1 | [revocation] |
2 | AUTOSTART = YES | 2 | AUTOSTART = @AUTOSTART@ |
3 | @JAVAPORT@PORT = 2112 | 3 | @JAVAPORT@PORT = 2112 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | BINARY = gnunet-service-revocation | 5 | 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 @@ | |||
1 | [statistics] | 1 | [statistics] |
2 | AUTOSTART = YES | 2 | AUTOSTART = @AUTOSTART@ |
3 | @JAVAPORT@PORT = 2088 | 3 | @JAVAPORT@PORT = 2088 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | BINARY = gnunet-service-statistics | 5 | 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 @@ | |||
1 | [transport] | 1 | [transport] |
2 | AUTOSTART = YES | 2 | AUTOSTART = @AUTOSTART@ |
3 | @JAVAPORT@PORT = 2091 | 3 | @JAVAPORT@PORT = 2091 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | BINARY = gnunet-service-transport | 5 | 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 @@ | |||
1 | [resolver] | 1 | [resolver] |
2 | AUTOSTART = YES | 2 | AUTOSTART = @AUTOSTART@ |
3 | @JAVAPORT@PORT = 2089 | 3 | @JAVAPORT@PORT = 2089 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | BINARY = gnunet-service-resolver | 5 | 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 @@ | |||
1 | [vpn] | 1 | [vpn] |
2 | AUTOSTART = YES | 2 | AUTOSTART = @AUTOSTART@ |
3 | @UNIXONLY@ PORT = 2105 | 3 | @UNIXONLY@ PORT = 2105 |
4 | HOSTNAME = localhost | 4 | HOSTNAME = localhost |
5 | BINARY = gnunet-service-vpn | 5 | BINARY = gnunet-service-vpn |