Permalink
Browse files

Removed now unused constants.DEFAULT_INSTALL_PATH

  • Loading branch information...
1 parent 8be3c8f commit cb53e892cce23149d23c5f777acb14fd727a324c @von committed Aug 5, 2011
Showing with 5 additions and 13 deletions.
  1. +4 −7 conf/PerProxy.conf
  2. +1 −1 perproxy/__init__.py
  3. +0 −3 perproxy/constants.py
  4. +0 −2 scripts/PerProxy
View
@@ -1,15 +1,12 @@
-[DEFAULT]
-InstallConfPath=%(InstallPath)s/etc/
-
[CA]
CertFile=%(UserConfigPath)s/ca-cert.crt
KeyFile=%(UserConfigPath)s/ca-key.pem
[Logging]
-Config=%(InstallConfPath)s/logging.config
+Config=%(UserConfigPath)s/logging.config
[Perspectives]
-NotaryFile=%(InstallConfPath)s/http_notary_list.txt
+NotaryFile=%(UserConfigPath)s/http_notary_list.txt
# Number of seconds we must have quorum (86400 == one day)
QuorumDuration=86400
# Percentage of notaries that must have seen certificate to achieve quorum
@@ -20,7 +17,7 @@ Hostname=localhost
Port=8080
[Templates]
-Error=%(InstallConfPath)s/error_template.html
+Error=%(UserConfigPath)s/error_template.html
[Whitelist]
-Filename=%(InstallConfPath)s/PerProxy-whitelist.txt
+Filename=%(UserConfigPath)s/PerProxy-whitelist.txt
View
@@ -5,4 +5,4 @@
from ProxyServer import ProxyServer, Handler
from WhiteList import WhiteList
-from constants import DEFAULT_INSTALL_PATH, DEFAULT_USER_CONF_PATH, VERSION
+from constants import DEFAULT_USER_CONF_PATH, VERSION
View
@@ -4,8 +4,5 @@
VERSION="0.2"
-# Default installation location
-DEFAULT_INSTALL_PATH="/usr/local/perproxy"
-
# Default place for user configuration
DEFAULT_USER_CONF_PATH="~/.PerProxy"
View
@@ -16,7 +16,6 @@ import time
from perproxy import CertificateAuthority
from perproxy import Checker
-from perproxy import DEFAULT_INSTALL_PATH
from perproxy import DEFAULT_USER_CONF_PATH
from perproxy import ProxyServer, Handler
from perproxy import WhiteList
@@ -73,7 +72,6 @@ def parse_args(argv):
(("Whitelist", "Filename"), "whitelist_filename"),
]
config_default = {
- "InstallPath" : DEFAULT_INSTALL_PATH,
"UserConfigPath" : DEFAULT_USER_CONF_PATH,
}
config = ConfigParser.SafeConfigParser(config_default)

0 comments on commit cb53e89

Please sign in to comment.