[tor-commits] [torsocks/master] Change torsocks config dir by adding /tor
dgoulet at torproject.org
dgoulet at torproject.org
Fri Apr 4 22:40:26 UTC 2014
commit 990b3628c5c3f8048a4d15b490531643a261e149
Author: David Goulet <dgoulet at ev0ke.net>
Date: Sat Aug 24 15:56:11 2013 -0400
Change torsocks config dir by adding /tor
Signed-off-by: David Goulet <dgoulet at ev0ke.net>
---
doc/Makefile.am | 2 +-
src/common/defaults.h | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 4e1084c..5d8783f 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,5 @@
# Install configuration file
-confdir = $(CONFDIR)/
+confdir = $(CONFDIR)/tor
dist_conf_DATA = torsocks.conf
dist_man1_MANS = torsocks.1
diff --git a/src/common/defaults.h b/src/common/defaults.h
index 1a2c2fc..b2ad372 100644
--- a/src/common/defaults.h
+++ b/src/common/defaults.h
@@ -38,7 +38,8 @@
*/
#define DEFAULT_DOMAIN_NAME_SIZE 255
-#define DEFAULT_CONF_FILE "/etc/torsocks.conf"
+#define DEFAULT_CONF_FILENAME "torsocks.conf"
+#define DEFAULT_CONF_FILE CONFDIR "/tor/" DEFAULT_CONF_FILENAME
#define DEFAULT_CONF_FILE_ENV "TORSOCKS_CONF_FILE"
/*
More information about the tor-commits
mailing list