diff options
| author | Daniel Silverstone <dsilvers@digital-scurf.org> | 2017-07-30 18:40:56 -0400 |
|---|---|---|
| committer | Daniel Silverstone <dsilvers@digital-scurf.org> | 2017-07-31 16:58:58 -0400 |
| commit | 946f7d5acaf3d6192c64d6036216455fa36841f6 (patch) | |
| tree | f74eac61dd45ee9de86760cb30613ce5f1721b47 /testing | |
| parent | 574fca4502ad46b427a1c8dbf8ab34b90bc66f56 (diff) | |
| download | gitano-946f7d5acaf3d6192c64d6036216455fa36841f6.tar.gz | |
Pass LUA_INIT through for test purposes
In order to support the sysbranch work I'm doing for the CI, we need
LUA_INIT to get passed through in the environment.
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/gitano-test-tool.in | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/testing/gitano-test-tool.in b/testing/gitano-test-tool.in index 1fd39b0..78a6c0e 100644 --- a/testing/gitano-test-tool.in +++ b/testing/gitano-test-tool.in @@ -268,6 +268,7 @@ function cmd_setupstandard(owning_user, master_key, bypass_key) } if os.getenv("GTT_PROTO") == "http" then -- setup lighttpd + local lua_init = os.getenv("LUA_INIT") or "" local htpasswd = user_home(owning_user) .. "/htpasswd" local pid_file = basedir .. "lighttpd.pid" local port_file = basedir .. "lighttpd.port" @@ -285,6 +286,7 @@ function cmd_setupstandard(owning_user, master_key, bypass_key) $HTTP["url"] =~ ".*/gitano-command.cgi$" { setenv.add-environment = ( "HOME" => %q, + "LUA_INIT" => %q, "GITANO_ROOT" => %q ) @@ -308,6 +310,7 @@ $HTTP["url"] =~ "^/git/.*$" { "GIT_HTTP_EXPORT_ALL" => "", "GIT_PROJECT_ROOT" => %q, "HOME" => %q, + "LUA_INIT" => %q, "GITANO_ROOT" => %q ) @@ -322,9 +325,9 @@ $HTTP["url"] =~ "^/git/.*$" { auth.backend = "htpasswd" auth.backend.htpasswd.userfile = %q } -]]):format(user_home(owning_user), repo_path, htpasswd, +]]):format(user_home(owning_user), lua_init, repo_path, htpasswd, gitano.config.lib_bin_path() .. "/gitano-smart-http.cgi", repo_path, - user_home(owning_user), repo_path, htpasswd)) + user_home(owning_user), lua_init, repo_path, htpasswd)) fh:close() |