diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-23 12:02:01 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-23 12:02:01 +0000 |
commit | 3bc17773a5238c508c6f330744db5970ea62e88e (patch) | |
tree | 68f6787ec2dad2fc93aac86e551b07d126f97c1f /nixos/modules | |
parent | 7bf8b97d6851a79ad6d4101befd30069827f70b3 (diff) | |
parent | 55a4a2d60a420ca83f31e3f659beb295fd6b8626 (diff) | |
download | nixpkgs-3bc17773a5238c508c6f330744db5970ea62e88e.tar nixpkgs-3bc17773a5238c508c6f330744db5970ea62e88e.tar.gz nixpkgs-3bc17773a5238c508c6f330744db5970ea62e88e.tar.bz2 nixpkgs-3bc17773a5238c508c6f330744db5970ea62e88e.tar.lz nixpkgs-3bc17773a5238c508c6f330744db5970ea62e88e.tar.xz nixpkgs-3bc17773a5238c508c6f330744db5970ea62e88e.tar.zst nixpkgs-3bc17773a5238c508c6f330744db5970ea62e88e.zip |
Merge staging-next into staging
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/config/swap.nix | 11 | ||||
-rw-r--r-- | nixos/modules/services/web-apps/nextcloud.nix | 1 | ||||
-rw-r--r-- | nixos/modules/tasks/filesystems.nix | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix index a37b46b8c46..ff2ae1da31b 100644 --- a/nixos/modules/config/swap.nix +++ b/nixos/modules/config/swap.nix @@ -127,6 +127,15 @@ let ''; }; + options = mkOption { + default = [ "defaults" ]; + example = [ "nofail" ]; + type = types.listOf types.nonEmptyStr; + description = '' + Options used to mount the swap. + ''; + }; + deviceName = mkOption { type = types.str; internal = true; @@ -215,7 +224,7 @@ in fi ''} ${optionalString sw.randomEncryption.enable '' - cryptsetup plainOpen -c ${sw.randomEncryption.cipher} -d ${sw.randomEncryption.source} ${sw.device} ${sw.deviceName} + cryptsetup plainOpen -c ${sw.randomEncryption.cipher} -d ${sw.randomEncryption.source} ${optionalString (sw.discardPolicy != null) "--allow-discards"} ${sw.device} ${sw.deviceName} mkswap ${sw.realDevice} ''} ''; diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 111b3173469..5e15aaba096 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -699,7 +699,6 @@ in { }; extraConfig = '' index index.php index.html /index.php$request_uri; - expires 1m; add_header X-Content-Type-Options nosniff; add_header X-XSS-Protection "1; mode=block"; add_header X-Robots-Tag none; diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index d274a38a270..2f17608560f 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -255,7 +255,7 @@ in # https://wiki.archlinux.org/index.php/fstab#Filepath_spaces escape = string: builtins.replaceStrings [ " " "\t" ] [ "\\040" "\\011" ] string; swapOptions = sw: concatStringsSep "," ( - [ "defaults" ] + sw.options ++ optional (sw.priority != null) "pri=${toString sw.priority}" ++ optional (sw.discardPolicy != null) "discard${optionalString (sw.discardPolicy != "both") "=${toString sw.discardPolicy}"}" ); |