public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #108511 from nagy/apache-lua-path-fix 

nixos/httpd: fix lua paths
This commit is contained in:
Mario Rodas 2021-02-11 20:04:42 -05:00 committed by GitHub
parent d10df5f791 7c121e60c5
commit ffedd32f9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/modules/services/web-servers/apache-httpd/default.nix
View File

@ -126,10 +126,14 @@ let
</IfModule> </IfModule>
''; '';
luaSetPaths = '' luaSetPaths = let
# support both lua and lua.withPackages derivations
luaversion = cfg.package.lua5.lua.luaversion or cfg.package.lua5.luaversion;
in
''
<IfModule mod_lua.c> <IfModule mod_lua.c>
LuaPackageCPath ${cfg.package.lua5}/lib/lua/${cfg.package.lua5.lua.luaversion}/?.so LuaPackageCPath ${cfg.package.lua5}/lib/lua/${luaversion}/?.so
LuaPackagePath ${cfg.package.lua5}/share/lua/${cfg.package.lua5.lua.luaversion}/?.lua LuaPackagePath ${cfg.package.lua5}/share/lua/${luaversion}/?.lua
</IfModule> </IfModule>
''; '';
@ -333,7 +337,7 @@ let
${sslConf} ${sslConf}
${if cfg.package.luaSupport then luaSetPaths else ""} ${optionalString cfg.package.luaSupport luaSetPaths}
# Fascist default - deny access to everything. # Fascist default - deny access to everything.
<Directory /> <Directory />