diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2008-07-17 15:07:04 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2008-07-17 15:07:04 -0400 |
| commit | 9c4f18375306f23bd6d6485485dccb36b0a0f43b (patch) | |
| tree | 3408b37afe4c860ea4f19dbb98c141ebc69ae98b /scripts | |
| parent | 8b03181447cb35d308273c56bb99fa482eecd224 (diff) | |
| download | cobbler-9c4f18375306f23bd6d6485485dccb36b0a0f43b.tar.gz cobbler-9c4f18375306f23bd6d6485485dccb36b0a0f43b.tar.xz cobbler-9c4f18375306f23bd6d6485485dccb36b0a0f43b.zip | |
Reinstating findks.cgi support, this time as mod_python.
See http://server/cblr/svc/op/findks which will get the kickstart for the IP or MAC of the requester.
Note MAC is only sent when using kssendmac from Anaconda.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/services.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/scripts/services.py b/scripts/services.py index a820b61c..97a6f89c 100755 --- a/scripts/services.py +++ b/scripts/services.py @@ -35,9 +35,6 @@ def handler(req): my_uri = req.uri - - - # apache.log_error("cannot load /var/lib/cobbler/web.ss") req.add_common_vars() # process form and qs data, if any @@ -66,8 +63,12 @@ def handler(req): apache.log_error("adding %s to %s" % (field,t)) label = not label - form["REMOTE_ADDR"] = req.subprocess_env.get("REMOTE_ADDR",None) - form["REMOTE_MAC"] = req.subprocess_env.get("HTTP_X_RHN_PROVISIONING_MAC_0",None) + # TESTING.. + form.update(req.subprocess_env) + + #form["REMOTE_ADDR"] = req.headers_in.get("REMOTE_ADDR",None) + #form["REMOTE_MAC"] = req.subprocess_env.get("HTTP_X_RHN_PROVISIONING_MAC_0",None) + form["REMOTE_MAC"] = form.get("HTTP_X_RHN_PROVISIONING_MAC_0",None) http_port = utils.parse_settings_lame("http_port",default="80") |