[tor-commits] [arm/release] fix: correcting default control socket path

[atagar at torproject.org]

commit ee6721e5dfc19fd360313d4630efc1e3591b9364
Author: Damian Johnson <atagar at torproject.org>
Date:   Thu Aug 11 08:18:05 2011 -0700

    fix: correcting default control socket path
    
    According to dererk the default control socket path is "/var/run/tor/control"
    rather than "/var/lib/tor/control" (the path mentioned by Peter).
---
 armrc.sample           |    2 +-
 src/cli/headerPanel.py |    2 +-
 src/starter.py         |    2 +-
 src/util/torTools.py   |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/armrc.sample b/armrc.sample
index 22fb903..e19d4c4 100644
--- a/armrc.sample
+++ b/armrc.sample
@@ -2,7 +2,7 @@
 startup.controlPassword
 startup.interface.ipAddress 127.0.0.1
 startup.interface.port 9051
-startup.interface.socket /var/lib/tor/control
+startup.interface.socket /var/run/tor/control
 startup.blindModeEnabled false
 startup.events N3
 startup.dataDirectory ~/.arm
diff --git a/src/cli/headerPanel.py b/src/cli/headerPanel.py
index d5ce332..0e8c018 100644
--- a/src/cli/headerPanel.py
+++ b/src/cli/headerPanel.py
@@ -41,7 +41,7 @@ VERSION_STATUS_COLORS = {"new": "blue", "new in series": "blue", "obsolete": "re
 
 DEFAULT_CONFIG = {"startup.interface.ipAddress": "127.0.0.1",
                   "startup.interface.port": 9051,
-                  "startup.interface.socket": "/var/lib/tor/control",
+                  "startup.interface.socket": "/var/run/tor/control",
                   "features.showFdUsage": False,
                   "log.fdUsageSixtyPercent": log.NOTICE,
                   "log.fdUsageNinetyPercent": log.WARN}
diff --git a/src/starter.py b/src/starter.py
index a148947..2bdc6d0 100644
--- a/src/starter.py
+++ b/src/starter.py
@@ -35,7 +35,7 @@ DEFAULT_CONFIG = os.path.expanduser("~/.arm/armrc")
 CONFIG = {"startup.controlPassword": None,
           "startup.interface.ipAddress": "127.0.0.1",
           "startup.interface.port": 9051,
-          "startup.interface.socket": "/var/lib/tor/control",
+          "startup.interface.socket": "/var/run/tor/control",
           "startup.blindModeEnabled": False,
           "startup.events": "N3",
           "startup.dataDirectory": "~/.arm",
diff --git a/src/util/torTools.py b/src/util/torTools.py
index 366deb0..39cb176 100644
--- a/src/util/torTools.py
+++ b/src/util/torTools.py
@@ -113,7 +113,7 @@ def loadConfig(config):
 
 # TODO: temporary code until this is added to torctl as part of...
 # https://trac.torproject.org/projects/tor/ticket/3638
-def connect_socket(socketPath="/var/lib/tor/control", ConnClass=TorCtl.Connection):
+def connect_socket(socketPath="/var/run/tor/control", ConnClass=TorCtl.Connection):
   """
   Connects to a unix domain socket available to controllers (set via tor's
   ControlSocket option). This raises an IOError if unable to do so.