[or-cvs] cause configure to create a tor.sh which will have director...

[sah at seul.org]

Update of /home/or/cvsroot/src/config
In directory moria.mit.edu:/home/sah/src/config

Modified Files:
	Makefile.am 
Added Files:
	torrc.in sample-server-torrc.in 
Log Message:
- cause configure to create a tor.sh which will have directories set
  correctly based on how configure was run

- cause tor to guess the location of torrc more intelligently

- cause cause src/config/torrc and src/conf/sample-server-torrc to be
  generated with contents that are correct for the way configure was
  run

- cause "make install" to put torrc, sample-server-torrc, and
  dirservers somewhere intelligent


--- NEW FILE: torrc.in ---
# Configuration file for a typical tor client
# (listen for applications only)

# List of routers. Tor nodes only know about the directory servers
# at the beginning, and from them they get a list of currently up nodes.
RouterFile @CONFDIR@/dirservers

# Ports for various services. Comment out if you're not running that
# service.
#ORPort 9001
APPort 9050


--- NEW FILE: sample-server-torrc.in ---
# Configuration file for a typical tor node

# The directory for keeping all the config/data for this node
DataDirectory @LOCALSTATEDIR@/lib/tor
# A unique handle for this node
Nickname moria4

# Ports for various services. Comment out or set to 0 if you're not
# offering that service.
ORPort 9004 # listening for cell-speaking connections
APPort 9024 # listening for socks-speaking connections
#DirPort 0

# Leave this set, or we'll be treated like a client.
OnionRouter 1

# List of routers. Tor nodes only know about the directory servers
# at the beginning, and from them they get a list of currently up nodes.
RouterFile @CONFDIR@/dirservers


Index: Makefile.am
===================================================================
RCS file: /home/or/cvsroot/src/config/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.am	7 Oct 2003 16:30:38 -0000	1.1
+++ Makefile.am	15 Oct 2003 07:19:38 -0000	1.2
@@ -1,3 +1,5 @@
+confdir = $(sysconfdir)/tor
 
-EXTRA_DIST = dirservers oprc sample-orrc
+EXTRA_DIST = dirservers
 
+conf_DATA = dirservers torrc sample-server-torrc