about summary refs log tree commit diff
path: root/ops
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2022-02-17T17·33+0300
committerclbot <clbot@tvl.fyi>2022-02-18T08·15+0000
commitf4f1d97052199143660508e0cf56aa3aef8e02d9 (patch)
treef64500248763e2ec0c5a01597ea9e82bf080834f /ops
parent6b3eed1fb50552189e945cc11b14d8588bcad1ef (diff)
refactor(ops/modules): Move ACME base configuration into base.nix r/3842
This needs to be present on all machines that run ACME stuff.

I've switched the address for a .su one because I have a catchall for
these.

Change-Id: I7af8e1f1cb2fcfbcba4b7d1930ed0edef0106d72
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5306
Autosubmit: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'ops')
-rw-r--r--ops/machines/whitby/default.nix5
-rw-r--r--ops/modules/www/base.nix5
2 files changed, 5 insertions, 5 deletions
diff --git a/ops/machines/whitby/default.nix b/ops/machines/whitby/default.nix
index e9ec50da13..61f44a5ec4 100644
--- a/ops/machines/whitby/default.nix
+++ b/ops/machines/whitby/default.nix
@@ -651,10 +651,5 @@ in
     };
   };
 
-  security.acme = {
-    acceptTerms = true;
-    defaults.email = "certs@tvl.fyi";
-  };
-
   system.stateVersion = "20.03";
 }
diff --git a/ops/modules/www/base.nix b/ops/modules/www/base.nix
index fbf0514161..375c1a6b76 100644
--- a/ops/modules/www/base.nix
+++ b/ops/modules/www/base.nix
@@ -2,6 +2,11 @@
 
 {
   config = {
+    security.acme = {
+      acceptTerms = true;
+      defaults.email = "letsencrypt@tvl.su";
+    };
+
     services.nginx = {
       enable = true;
       enableReload = true;