diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/acf_cli-controller.lua | 7 | ||||
| -rw-r--r-- | app/acf_www-controller.lua | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/app/acf_cli-controller.lua b/app/acf_cli-controller.lua index d2b57e2..c2abaee 100644 --- a/app/acf_cli-controller.lua +++ b/app/acf_cli-controller.lua @@ -1,13 +1,14 @@ module(..., package.seeall) +require("posix") + -- We use the parent exception handler in a last-case situation local parent_exception_handler mvc = {} mvc.on_load = function (self, parent) - -- Make sure we have some kind of sane defaults for libdir and sessiondir - self.conf.libdir = self.conf.libdir or ( self.conf.appdir .. "/lib/" ) - self.conf.sessiondir = self.conf.sessiondir or "/tmp/" + -- Make sure we have some kind of sane defaults for libdir + self.conf.libdir = self.conf.libdir or ( posix.dirname(self.conf.appdir) .. "/lib/" ) self.conf.script = "" self.conf.default_prefix = "/acf-util/" self.conf.default_controller = "welcome" diff --git a/app/acf_www-controller.lua b/app/acf_www-controller.lua index 5803464..9c63d74 100644 --- a/app/acf_www-controller.lua +++ b/app/acf_www-controller.lua @@ -223,8 +223,9 @@ mvc.on_load = function (self, parent) --logevent("acf_www-controller mvc.on_load") - -- Make sure we have some kind of sane defaults for libdir and sessiondir - self.conf.libdir = self.conf.libdir or ( self.conf.appdir .. "/lib/" ) + -- Make sure we have some kind of sane defaults for libdir, wwwdir, and sessiondir + self.conf.libdir = self.conf.libdir or ( posix.dirname(self.conf.appdir) .. "/lib/" ) + self.conf.wwwdir = self.conf.wwwdir or ( posix.dirname(self.conf.appdir) .. "/www/" ) self.conf.sessiondir = self.conf.sessiondir or "/tmp/" self.conf.script = ENV.SCRIPT_NAME self.conf.default_prefix = "/acf-util/" |