From de24b00d41d6a80ccae0adecc3557c7c7154aa22 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 11 Dec 2015 17:42:17 +0100
Subject: [PATCH] nixos/simp_le: Rename to security.acme

---
 nixos/modules/module-list.nix                 |  2 +-
 .../simp_le.nix => security/acme.nix}         | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)
 rename nixos/modules/{services/security/simp_le.nix => security/acme.nix} (92%)

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index c708f095f40a..039b562b6f31 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -80,6 +80,7 @@
   ./programs/xfs_quota.nix
   ./programs/zsh/zsh.nix
   ./rename.nix
+  ./security/acme.nix
   ./security/apparmor.nix
   ./security/apparmor-suid.nix
   ./security/ca.nix
@@ -388,7 +389,6 @@
   ./services/security/hologram.nix
   ./services/security/munge.nix
   ./services/security/physlock.nix
-  ./services/security/simp_le.nix
   ./services/security/torify.nix
   ./services/security/tor.nix
   ./services/security/torsocks.nix
diff --git a/nixos/modules/services/security/simp_le.nix b/nixos/modules/security/acme.nix
similarity index 92%
rename from nixos/modules/services/security/simp_le.nix
rename to nixos/modules/security/acme.nix
index 12d9f9708164..72eac82defa3 100644
--- a/nixos/modules/services/security/simp_le.nix
+++ b/nixos/modules/security/acme.nix
@@ -4,7 +4,7 @@ with lib;
 
 let
 
-  cfg = config.services.simp_le;
+  cfg = config.security.acme;
 
   certOpts = { ... }: {
     options = {
@@ -40,13 +40,13 @@ let
       user = mkOption {
         type = types.str;
         default = "root";
-        description = "User under which simp_le would run.";
+        description = "User running the ACME client.";
       };
 
       group = mkOption {
         type = types.str;
         default = "root";
-        description = "Group under which simp_le would run.";
+        description = "Group running the ACME client.";
       };
 
       postRun = mkOption {
@@ -95,9 +95,9 @@ in
   ###### interface
 
   options = {
-    services.simp_le = {
+    security.acme = {
       directory = mkOption {
-        default = "/var/lib/simp_le";
+        default = "/var/lib/acme";
         type = types.str;
         description = ''
           Directory where certs and other state will be stored by default.
@@ -138,9 +138,9 @@ in
                   ++ concatLists (mapAttrsToList (name: root: [ "-d" (if root == null then name else "${name}:${root}")]) data.extraDomains);
 
       in nameValuePair
-      ("simp_le-${cert}")
+      ("acme-${cert}")
       ({
-        description = "simp_le cert renewal for ${cert}";
+        description = "ACME cert renewal for ${cert} using simp_le";
         after = [ "network.target" ];
         serviceConfig = {
           Type = "oneshot";
@@ -177,13 +177,13 @@ in
     );
 
     systemd.timers = flip mapAttrs' cfg.certs (cert: data: nameValuePair
-      ("simp_le-${cert}")
+      ("acme-${cert}")
       ({
-        description = "timer for simp_le cert renewal of ${cert}";
+        description = "timer for ACME cert renewal of ${cert}";
         wantedBy = [ "timers.target" ];
         timerConfig = {
           OnCalendar = data.renewInterval;
-          Unit = "simp_le-${cert}.service";
+          Unit = "acme-simp_le-${cert}.service";
         };
       })
     );