diff options
| author | James Cammarata <jimi@sngx.net> | 2009-03-07 21:44:00 -0600 |
|---|---|---|
| committer | James Cammarata <jimi@sngx.net> | 2009-03-07 21:44:00 -0600 |
| commit | d3fdc6d4965b02ce18346f067c14080115943a38 (patch) | |
| tree | d2fa630d3f0e941acb7f5115c31ea91aabb4ae11 /scripts/index.py | |
| parent | 54e462f3dca472d8bb8dc8a2b0a69c60ed9fe2ec (diff) | |
| parent | 61db7baa541acc32b305ea6977a14ee8f5b3f470 (diff) | |
| download | cobbler-d3fdc6d4965b02ce18346f067c14080115943a38.tar.gz cobbler-d3fdc6d4965b02ce18346f067c14080115943a38.tar.xz cobbler-d3fdc6d4965b02ce18346f067c14080115943a38.zip | |
Merge branch 'devel' of git://git.fedorahosted.org/cobbler into ris-devel
Conflicts:
cobbler/utils.py
Diffstat (limited to 'scripts/index.py')
| -rwxr-xr-x | scripts/index.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/index.py b/scripts/index.py index 26b86f36..5acfe09e 100755 --- a/scripts/index.py +++ b/scripts/index.py @@ -21,9 +21,9 @@ import cgi import os from cobbler.webui import CobblerWeb import cobbler.utils as utils -import cobbler.yaml as yaml +import yaml # PyYAML -XMLRPC_SERVER = "http://127.0.0.1:25152" # was http://127.0.0.1/cobbler_api_rw" +XMLRPC_SERVER = "http://127.0.0.1:25151" # FIXME: pull port from settings #======================================= @@ -109,8 +109,8 @@ def handler(req): fd = open("/etc/cobbler/settings") data = fd.read() fd.close() - ydata = yaml.load(data).next() - remote_port = ydata.get("xmlrpc_rw_port", 25152) + ydata = yaml.load(data) + remote_port = ydata.get("xmlrpc_port", 25151) mode = form.get('mode','index') |