summary refs log tree commit diff
diff options
context:
space:
mode:
authorJean-Baptiste Giraudeau <jean-baptiste.giraudeau@iohk.io>2021-03-15 17:54:11 +0100
committerJonathan Ringer <jonringer@users.noreply.github.com>2021-05-03 11:23:03 -0700
commit62f241d4457381b1a0cdd0903501ad5f90e888c1 (patch)
tree736f8bda5c6e749c26243f043e5c4b23ea8e2fda
parent0111666954f772565cd83c3b7bea179e7808515c (diff)
downloadnixpkgs-62f241d4457381b1a0cdd0903501ad5f90e888c1.tar
nixpkgs-62f241d4457381b1a0cdd0903501ad5f90e888c1.tar.gz
nixpkgs-62f241d4457381b1a0cdd0903501ad5f90e888c1.tar.bz2
nixpkgs-62f241d4457381b1a0cdd0903501ad5f90e888c1.tar.lz
nixpkgs-62f241d4457381b1a0cdd0903501ad5f90e888c1.tar.xz
nixpkgs-62f241d4457381b1a0cdd0903501ad5f90e888c1.tar.zst
nixpkgs-62f241d4457381b1a0cdd0903501ad5f90e888c1.zip
nixos/oauth2_proxy_nginx: add nginx config only if oauth2_proxy is enabled.
-rw-r--r--nixos/modules/services/security/oauth2_proxy_nginx.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/modules/services/security/oauth2_proxy_nginx.nix b/nixos/modules/services/security/oauth2_proxy_nginx.nix
index 553638ad496..d82ddb894ea 100644
--- a/nixos/modules/services/security/oauth2_proxy_nginx.nix
+++ b/nixos/modules/services/security/oauth2_proxy_nginx.nix
@@ -23,7 +23,8 @@ in
   config.services.oauth2_proxy = mkIf (cfg.virtualHosts != [] && (hasPrefix "127.0.0.1:" cfg.proxy)) {
     enable = true;
   };
-  config.services.nginx = mkMerge ((optional (cfg.virtualHosts != []) {
+  config.services.nginx = mkIf config.services.oauth2_proxy.enable (mkMerge
+  ((optional (cfg.virtualHosts != []) {
     recommendedProxySettings = true; # needed because duplicate headers
   }) ++ (map (vhost: {
     virtualHosts.${vhost} = {
@@ -60,5 +61,5 @@ in
       '';
 
     };
-  }) cfg.virtualHosts));
+  }) cfg.virtualHosts)));
 }