diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-01-10 12:25:53 -0500 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-01-10 12:25:53 -0500 |
| commit | 0f365286251d26dfcc7e50a54fea6fd3591d3408 (patch) | |
| tree | c0236440a20019d9c007cccfc08a3017d9de7562 /cobbler/utils.py | |
| parent | c2d12b94867d9c02ca5ace4195975ac9c97325d5 (diff) | |
| download | third_party-cobbler-0f365286251d26dfcc7e50a54fea6fd3591d3408.tar.gz third_party-cobbler-0f365286251d26dfcc7e50a54fea6fd3591d3408.tar.xz third_party-cobbler-0f365286251d26dfcc7e50a54fea6fd3591d3408.zip | |
Added http_port parameter to settings so Apache can run on ports other than 80.
Diffstat (limited to 'cobbler/utils.py')
| -rw-r--r-- | cobbler/utils.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cobbler/utils.py b/cobbler/utils.py index 20a5d67..80dae73 100644 --- a/cobbler/utils.py +++ b/cobbler/utils.py @@ -323,6 +323,12 @@ def blender(api_handle,remove_hashes, root_obj, blend_cache=None): if not results.has_key(key): results[key] = interface[key] + http_port = results.get("http_port",80) + if http_port != 80: + results["http_server"] = "%s:%s" % (results["server"] , http_port) + else: + results["http_server"] = results["server"] + # sanitize output for koan and kernel option lines, etc if remove_hashes: results = flatten(results) |