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

nginx: allow basic auth passwords to be specified in a file

Browse Source
This commit is contained in:
Ben Wolsieffer 2018-04-04 21:47:56 -04:00 committed by Robin Gloster
parent c84dad316a
commit 4d40adb86d
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nixos/modules/services/web-servers/nginx/default.nix
View File

@ -218,7 +218,10 @@ let
ssl_certificate_key ${vhost.sslCertificateKey}; ssl_certificate_key ${vhost.sslCertificateKey};
''} ''}
${optionalString (vhost.basicAuth != {}) (mkBasicAuth vhostName vhost.basicAuth)} ${optionalString (vhost.basicAuthFile != null || vhost.basicAuth != {}) ''
auth_basic secured;
auth_basic_user_file ${if vhost.basicAuthFile != null then vhost.basicAuthFile else mkHtpasswd vhostName vhost.basicAuth};
''}
${mkLocations vhost.locations} ${mkLocations vhost.locations}
@ -248,16 +251,11 @@ let
${optionalString (config.proxyPass != null && cfg.recommendedProxySettings) "include ${recommendedProxyConfig};"} ${optionalString (config.proxyPass != null && cfg.recommendedProxySettings) "include ${recommendedProxyConfig};"}
} }
'') locations); '') locations);
mkBasicAuth = vhostName: authDef: let mkHtpasswd = vhostName: authDef: pkgs.writeText "${vhostName}.htpasswd" (
htpasswdFile = pkgs.writeText "${vhostName}.htpasswd" ( concatStringsSep "\n" (mapAttrsToList (user: password: ''
concatStringsSep "\n" (mapAttrsToList (user: password: '' ${user}:{PLAIN}${password}
${user}:{PLAIN}${password} '') authDef)
'') authDef) );
);
in ''
auth_basic secured;
auth_basic_user_file ${htpasswdFile};
'';
in in
{ {

8
nixos/modules/services/web-servers/nginx/vhost-options.nix
View File

@ -193,6 +193,14 @@ with lib;
''; '';
}; };
basicAuthFile = mkOption {
type = types.nullOr types.path;
default = null;
description = ''
Basic Auth password file for a vhost.
'';
};
locations = mkOption { locations = mkOption {
type = types.attrsOf (types.submodule (import ./location-options.nix { type = types.attrsOf (types.submodule (import ./location-options.nix {
inherit lib; inherit lib;