diff options
| author | Matthew Justin Bauer <mjbauer95@gmail.com> | 2018-03-27 18:43:03 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-27 18:43:03 -0500 |
| commit | 75616ceb49d4e51a3c8efbebc17c09553707fb2c (patch) | |
| tree | 23c9dfd0b70ce4449be8ebef66919e6239a90f2b /nixos/modules/security | |
| parent | 9c4745fe73d986e894732501a5de078b3d2bbc30 (diff) | |
| parent | 49455d7bae2f81c5c984faa6728c9017123fa798 (diff) | |
| download | nixlib-75616ceb49d4e51a3c8efbebc17c09553707fb2c.tar nixlib-75616ceb49d4e51a3c8efbebc17c09553707fb2c.tar.gz nixlib-75616ceb49d4e51a3c8efbebc17c09553707fb2c.tar.bz2 nixlib-75616ceb49d4e51a3c8efbebc17c09553707fb2c.tar.lz nixlib-75616ceb49d4e51a3c8efbebc17c09553707fb2c.tar.xz nixlib-75616ceb49d4e51a3c8efbebc17c09553707fb2c.tar.zst nixlib-75616ceb49d4e51a3c8efbebc17c09553707fb2c.zip | |
Merge pull request #37840 from matthewbauer/unixtools
Cross-platform "unixtools"
Diffstat (limited to 'nixos/modules/security')
| -rw-r--r-- | nixos/modules/security/acme.nix | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 0736239ed2cf..e9676d9dfb15 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -140,14 +140,6 @@ in ''; }; - tosHash = mkOption { - type = types.string; - default = "cc88d8d9517f490191401e7b54e9ffd12a2b9082ec7a1d4cec6101f9f1647e7b"; - description = '' - SHA256 of the Terms of Services document. This changes once in a while. - ''; - }; - production = mkOption { type = types.bool; default = true; @@ -196,7 +188,7 @@ in let cpath = "${cfg.directory}/${cert}"; rights = if data.allowKeysForGroup then "750" else "700"; - cmdline = [ "-v" "-d" data.domain "--default_root" data.webroot "--valid_min" cfg.validMin "--tos_sha256" cfg.tosHash ] + cmdline = [ "-v" "-d" data.domain "--default_root" data.webroot "--valid_min" cfg.validMin ] ++ optionals (data.email != null) [ "--email" data.email ] ++ concatMap (p: [ "-f" p ]) data.plugins ++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains) |