diff options
| author | Steven Barth <steven@midlink.org> | 2008-07-24 13:55:11 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2008-07-24 13:55:11 +0000 |
| commit | 7384e0e6b77518efa4d113ede46f8c107de6f604 (patch) | |
| tree | abe961b734c865ce3965f45585528c1ff39b94bd /libs/httpd | |
| parent | f94c7b2c10d11d343c464be707e12c5754728b06 (diff) | |
Rewrote host environment targets to work out of the box
Diffstat (limited to 'libs/httpd')
| -rwxr-xr-x | libs/httpd/host/runluci | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/libs/httpd/host/runluci b/libs/httpd/host/runluci index 1d5812679..6f6cdde3d 100755 --- a/libs/httpd/host/runluci +++ b/libs/httpd/host/runluci @@ -4,19 +4,25 @@ require("luci.httpd.server") require("luci.httpd.handler.file") require("luci.httpd.handler.luci") -DOCROOT = arg[1] +SYSROOT = arg[1] +DOCROOT = SYSROOT .. arg[2] PORT = 8080 collectgarbage("setpause", 150) serversocket = luci.httpd.Socket("0.0.0.0", PORT) - server = luci.httpd.server.Server() vhost = luci.httpd.server.VHost() server:set_default_vhost(vhost) +if pcall(require, "uci") and pcall(require, "luci.model.uci") then + luci.model.uci.confdir_default = SYSROOT .. luci.model.uci.confdir_default + luci.model.uci.savedir_state = SYSROOT .. luci.model.uci.savedir_state + luci.model.uci.set_confdir(luci.model.uci.confdir_default) +end + filehandler = luci.httpd.handler.file.Simple(DOCROOT) vhost:set_default_handler(filehandler) |