[tor/el6] Run tor with "-f /etc/tor/torrc" argument

[Jamie Nguyen]

commit 10baf0c0dcf49aecaa0682ad059a266ccf736897
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Tue Mar 5 00:16:17 2013 +0000

    Run tor with "-f /etc/tor/torrc" argument

 tor.service |    2 +-
 tor.spec    |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/tor.service b/tor.service
index 4d7656f..326600c 100644
--- a/tor.service
+++ b/tor.service
@@ -15,7 +15,7 @@ DAEMON=/usr/bin/tor
 NAME=tor
 PIDFILE=/var/run/tor/tor.pid
 STOP_TIMEOUT=60
-DEFAULT_ARGS="--defaults-torrc /usr/share/tor/defaults-torrc"
+DEFAULT_ARGS="--defaults-torrc /usr/share/tor/defaults-torrc -f /etc/tor/torrc"
 VERIFY_ARGS="--verify-config $DEFAULT_ARGS"
 ARGS="--hush"
 
diff --git a/tor.spec b/tor.spec
index 9c74016..c2ac806 100644
--- a/tor.spec
+++ b/tor.spec
@@ -142,6 +142,7 @@ fi
 - whitespace changes and reorganization to make the spec more similar to
   fedora master branch (to make maintenance more straightforward)
 - do not mention torctl in the service file as it isn't used
+- add "-f /etc/tor/torrc" to default arguments when starting tor
 
 * Wed Feb 27 2013 Jamie Nguyen <jamielinux at fedoraproject.org> - 0.2.3.25-5
 - add torsocks to Requires