summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlurchi <lurchi@strangeplace.net>2019-06-27 18:28:25 +0200
committerlurchi <lurchi@strangeplace.net>2019-06-27 18:28:25 +0200
commitfc37373f7af06b736f028d73712f9e60be241cbf (patch)
tree4284a065b7f08f2bb07962c661df80e090f62626
parent7aba81537bfb410ab71db1702dbf2f1104b5d39f (diff)
add HELPER_PATH to default configscustom-helper-path
-rw-r--r--src/dns/dns.conf.in4
-rw-r--r--src/exit/exit.conf5
-rw-r--r--src/nat/nat.conf.in5
-rw-r--r--src/vpn/vpn.conf.in4
4 files changed, 18 insertions, 0 deletions
diff --git a/src/dns/dns.conf.in b/src/dns/dns.conf.in
index 39f260813..019f82c4a 100644
--- a/src/dns/dns.conf.in
+++ b/src/dns/dns.conf.in
@@ -32,3 +32,7 @@ IPV4MASK = 255.255.0.0
# public DNS resolver or your ISP's resolver from /etc/resolv.conf.
DNS_EXIT = 8.8.8.8
+# Location of the helper binary gnunet-helper-dns (setuid flag required).
+# By default it is assumed to be in the libexec directory, but on some systems
+# like NixOS setuid is only possible through a wrapper in a different location.
+HELPER_PATH =
diff --git a/src/exit/exit.conf b/src/exit/exit.conf
index 829c5bf80..eaaaf8635 100644
--- a/src/exit/exit.conf
+++ b/src/exit/exit.conf
@@ -66,3 +66,8 @@ ENABLE_IPV6 = YES
# Maximum number of concurrent connections this exit supports.
MAX_CONNECTIONS = 256
+
+# Location of the helper binary gnunet-helper-exit (setuid flag required).
+# By default it is assumed to be in the libexec directory, but on some systems
+# like NixOS setuid is only possible through a wrapper in a different location.
+HELPER_PATH =
diff --git a/src/nat/nat.conf.in b/src/nat/nat.conf.in
index a8dbee953..a86f60fed 100644
--- a/src/nat/nat.conf.in
+++ b/src/nat/nat.conf.in
@@ -38,3 +38,8 @@ STUN_SERVERS = stun.gnunet.org stun.services.mozilla.com:3478 stun.ekiga.net:347
# After how long do we consider STUN data stale?
STUN_STALE = 60 min
+# Location of the helper binaries gnunet-helper-nat-client and
+# gnunet-helper-nat-server (setuid flag required).
+# By default it is assumed to be in the libexec directory, but on some systems like
+# NixOS setuid is only possible through a wrapper in a different location.
+HELPER_PATH =
diff --git a/src/vpn/vpn.conf.in b/src/vpn/vpn.conf.in
index c0f4c59ed..7e02ba1b0 100644
--- a/src/vpn/vpn.conf.in
+++ b/src/vpn/vpn.conf.in
@@ -17,3 +17,7 @@ VIRTDNS = 10.11.10.2
VIRTDNS6 = 1234::17
IFNAME = vpn-gnunet
+# Location of the helper binary gnunet-helper-vpn (setuid flag required).
+# By default it is assumed to be in the libexec directory, but on some systems
+# like NixOS setuid is only possible through a wrapper in a different location.
+HELPER_PATH =