ambroisie/nix-config
ambroisie/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: ambroisie:99cdb697f156fb4f917e87cf24f0424d6bb735d3
Branches Tags
ambroisie:main
ambroisie:add-jj
ambroisie:xdg-mime-apps
ambroisie:tmux-undercurls
ambroisie:export-nixos-homes
ambroisie:native-vim-snippets
ambroisie:add-impermanence
ambroisie:add-typos-hook
ambroisie:add-bazel-template
ambroisie:nvim-lua-lsp
ambroisie:xdg-nix
..
compare: ambroisie:538d00057593f80b73da0dfca967fe8c2d0f811e
Branches Tags
ambroisie:add-jj
ambroisie:main
ambroisie:xdg-mime-apps
ambroisie:tmux-undercurls
ambroisie:export-nixos-homes
ambroisie:native-vim-snippets
ambroisie:add-impermanence
ambroisie:add-typos-hook
ambroisie:add-bazel-template
ambroisie:nvim-lua-lsp
ambroisie:xdg-nix

8 commits
99cdb697f1 ... 538d000575

Author SHA1 Message Date
Bruno BELANYI
538d000575 WIP: WAITING FOR NIXPKS UPDATE
Some checks failed
ci/woodpecker/push/check Pipeline failed
Details
2023-12-25 19:55:20 +01:00
Bruno BELANYI
4c8f245ffc hosts: nixos: porthos: services: enable pyload 2023-12-25 19:55:20 +01:00
Bruno BELANYI
8a609d95ca hosts: nixos: porthos: secrets: add pyload creds 2023-12-25 19:55:20 +01:00
Bruno BELANYI
a031ad43d7 nixos: services: add pyload 2023-12-25 19:55:19 +01:00
Bruno BELANYI
e2c903a88b nixos: services: nginx: fix SSO subdomain 2023-12-25 19:54:57 +01:00
Bruno BELANYI
5ef3c1220e nixos: services: remove redundant subdomains 
See previous commit for the defaults.
 2023-12-25 19:54:57 +01:00
Bruno BELANYI
6ab27739a6 nixos: services: nginx: add default subdomain 
In almost all cases, the subdomain should be the same as the attribute
name...
 2023-12-25 19:54:57 +01:00
Bruno BELANYI
14a7ffa890 nixos: services: nginx: use attrset for vhosts 
Attribute sets compose better than lists, it was a mistake to use a list
in the first place...
 2023-12-25 19:54:57 +01:00
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/nixos/services/nginx/default.nix
View file

@ -189,7 +189,7 @@ in
config = lib.mkIf cfg.enable {
assertions = [ ]
++ (lib.flip lib.mapAttrsToList cfg.virtualHosts (_: { subdomain, ... } @ args:
++ (lib.flip lib.mapAttrsToList cfg.virtualHosts ({ subdomain, ... } @ args:
let
conflicts = [ "port" "root" "socket" "redirect" ];
optionsNotNull = builtins.map (v: args.${v} != null) conflicts;
@ -220,7 +220,7 @@ in
map mkAssertion nonUniques
) ++ (
let
subs = lib.mapAttrsToList (_: { subdomain, ... }: subdomain) cfg.virtualHosts;
subs = lib.mapAttrsToList ({ subdomain, ... }: subdomain) cfg.virtualHosts;
subsCounts = lib.my.countValues subs;
nonUniquesCounts = lib.filterAttrs (_: v: v != 1) subsCounts;
nonUniques = builtins.attrNames nonUniquesCounts;