openstack/swift
Code Issues Proposed changes

Changed default cluster url to point to new default proxy port of 8080,

Browse Source 
and set auth default port back to 11000
This commit is contained in:
Chuck Thier 2010-08-24 14:08:16 +00:00
parent 0e881304ae
commit 459e1e95bb
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bin/swift-auth-server
View File

@ -21,5 +21,4 @@ from swift.common.wsgi import run_wsgi
if __name__ == '__main__': if __name__ == '__main__':
if len(sys.argv) != 2: if len(sys.argv) != 2:
sys.exit("Usage: %s CONFIG_FILE" % sys.argv[0]) sys.exit("Usage: %s CONFIG_FILE" % sys.argv[0])
run_wsgi(sys.argv[1], 'auth-server', default_port=8080) run_wsgi(sys.argv[1], 'auth-server', default_port=11000)

2
etc/auth-server.conf-sample
View File

@ -16,7 +16,7 @@ use = egg:swift#auth
# log_facility = LOG_LOCAL0 # log_facility = LOG_LOCAL0
# log_level = INFO # log_level = INFO
# reseller_prefix = AUTH # reseller_prefix = AUTH
# default_cluster_url = http://127.0.0.1:9000/v1 # default_cluster_url = http://127.0.0.1:8080/v1
# token_life = 86400 # token_life = 86400
# log_headers = False # log_headers = False
# node_timeout = 10 # node_timeout = 10

2
swift/auth/server.py
View File

@ -93,7 +93,7 @@ class AuthController(object):
self.logger = get_logger(conf) self.logger = get_logger(conf)
self.swift_dir = conf.get('swift_dir', '/etc/swift') self.swift_dir = conf.get('swift_dir', '/etc/swift')
self.default_cluster_url = \ self.default_cluster_url = \
conf.get('default_cluster_url', 'http://127.0.0.1:9000/v1') conf.get('default_cluster_url', 'http://127.0.0.1:8080/v1')
self.token_life = int(conf.get('token_life', 86400)) self.token_life = int(conf.get('token_life', 86400))
self.log_headers = conf.get('log_headers') == 'True' self.log_headers = conf.get('log_headers') == 'True'
if ring: if ring: