gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(nginx): LUA_CPATH

Browse source
This commit is contained in:
arcnmx 2024-05-31 17:15:15 -07:00
parent 17d1f5147e
commit d5fb12ad9a
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
modules/nixos/nginx/lua.nix
View file

@ -12,6 +12,7 @@
cfg = lua; cfg = lua;
enabled = cfg.http.enable || cfg.upstream.enable; enabled = cfg.http.enable || cfg.upstream.enable;
luaPkgPath = pkg: "${pkg.lib or pkg}/lib/lua/${pkgs.luajit_openresty.luaversion}/?.lua"; luaPkgPath = pkg: "${pkg.lib or pkg}/lib/lua/${pkgs.luajit_openresty.luaversion}/?.lua";
luaCPkgPath = pkg: "${pkg.lib or pkg}/lib/lua/${pkgs.luajit_openresty.luaversion}/?.so";
luaModule = {config, ...}: let luaModule = {config, ...}: let
cfg = config.lua; cfg = config.lua;
mkSetBy = var: value: mkSetBy = var: value:
@ -89,6 +90,9 @@ in {
luaPath = mkOption { luaPath = mkOption {
type = separatedString ";"; type = separatedString ";";
}; };
luaCPath = mkOption {
type = separatedString ";";
};
}; };
virtualHosts = mkOption { virtualHosts = mkOption {
type = attrsOf (submoduleWith { type = attrsOf (submoduleWith {
@ -109,6 +113,10 @@ in {
map luaPkgPath cfg.modules map luaPkgPath cfg.modules
++ [(mkAfter ";")] ++ [(mkAfter ";")]
); );
luaCPath = mkMerge (
map luaCPkgPath cfg.modules
++ [(mkAfter ";")]
);
}; };
additionalModules = mkMerge [ additionalModules = mkMerge [
(mkIf cfg.ndk.enable [pkgs.nginxModules.develkit]) (mkIf cfg.ndk.enable [pkgs.nginxModules.develkit])
@ -117,7 +125,10 @@ in {
]; ];
}; };
systemd.services.nginx = mkIf config.services.nginx.enable { systemd.services.nginx = mkIf config.services.nginx.enable {
environment.LUA_PATH = mkIf enabled (mkOptionDefault cfg.luaPath); environment = mkIf enabled {
LUA_PATH = mkOptionDefault cfg.luaPath;
LUA_CPATH = mkOptionDefault cfg.luaCPath;
};
}; };
}; };
} }