From f86b87e0c0fc522b3e60869d5c534b8480c60ccb Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm@sourcephile.fr>
Date: Wed, 15 Jul 2020 02:12:58 +0200
Subject: [PATCH] systemd: fix reload of services

---
 nixos/modules/security/pass.nix           | 2 +-
 servers/losurdo/nginx/sourcephile.fr.nix  | 2 +-
 servers/losurdo/postgresql.nix            | 2 +-
 servers/mermet/dovecot/autogeree.net.nix  | 2 +-
 servers/mermet/dovecot/sourcephile.fr.nix | 2 +-
 servers/mermet/nginx/sourcephile.fr.nix   | 2 +-
 servers/mermet/postfix/autogeree.net.nix  | 2 +-
 servers/mermet/postfix/sourcephile.fr.nix | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/security/pass.nix b/nixos/modules/security/pass.nix
index a0922ac..385c9c1 100644
--- a/nixos/modules/security/pass.nix
+++ b/nixos/modules/security/pass.nix
@@ -107,7 +107,7 @@ options.security.pass = {
         postStart = lib.mkOption {
           type = types.lines;
           default = "";
-          example = "systemctl try-reload nginx.service";
+          example = "systemctl reload nginx.service";
           description = ''
             Commands to run after new secrets go live. Typically
             the web server and other servers using secrets need to
diff --git a/servers/losurdo/nginx/sourcephile.fr.nix b/servers/losurdo/nginx/sourcephile.fr.nix
index 5c13a2a..0a08fef 100644
--- a/servers/losurdo/nginx/sourcephile.fr.nix
+++ b/servers/losurdo/nginx/sourcephile.fr.nix
@@ -5,7 +5,7 @@ imports = map (m: import m {inherit domain;}) [
   sourcephile.fr/losurdo.nix
 ];
 security.acme.certs."${domain}" = {
-  postRun = "systemctl try-reload nginx";
+  postRun = "systemctl reload nginx";
 };
 systemd.services.dovecot2 = {
   wants = [ "acme-selfsigned-${domain}.service" "acme-${domain}.service"];
diff --git a/servers/losurdo/postgresql.nix b/servers/losurdo/postgresql.nix
index 096c479..b08ec58 100644
--- a/servers/losurdo/postgresql.nix
+++ b/servers/losurdo/postgresql.nix
@@ -18,7 +18,7 @@ networking.nftables.ruleset = ''
 '';
 users.groups.acme.members = [ users."postgres".name ];
 security.acme.certs."${networking.domain}" = {
-  postRun = "systemctl try-reload postgresql";
+  postRun = "systemctl reload postgresql";
 };
 systemd.services.postgresql = {
   wants = [ "acme-selfsigned-${networking.domain}.service" "acme-${networking.domain}.service"];
diff --git a/servers/mermet/dovecot/autogeree.net.nix b/servers/mermet/dovecot/autogeree.net.nix
index 3d3197a..a8afb2e 100644
--- a/servers/mermet/dovecot/autogeree.net.nix
+++ b/servers/mermet/dovecot/autogeree.net.nix
@@ -34,7 +34,7 @@ services.dovecot2.extraConfig =
   }
 '';
 security.acme.certs."${domain}" = {
-  postRun = "systemctl try-reload dovecot2";
+  postRun = "systemctl reload dovecot2";
 };
 systemd.services.dovecot2 = {
   wants = [ "acme-selfsigned-${domain}.service" "acme-${domain}.service"];
diff --git a/servers/mermet/dovecot/sourcephile.fr.nix b/servers/mermet/dovecot/sourcephile.fr.nix
index 74b4df2..eb5d692 100644
--- a/servers/mermet/dovecot/sourcephile.fr.nix
+++ b/servers/mermet/dovecot/sourcephile.fr.nix
@@ -34,7 +34,7 @@ services.dovecot2.extraConfig =
   }
 '';
 security.acme.certs."${domain}" = {
-  postRun = "systemctl try-reload dovecot2";
+  postRun = "systemctl reload dovecot2";
 };
 systemd.services.dovecot2 = {
   wants = [ "acme-selfsigned-${domain}.service" "acme-${domain}.service"];
diff --git a/servers/mermet/nginx/sourcephile.fr.nix b/servers/mermet/nginx/sourcephile.fr.nix
index 0d7a438..c282baa 100644
--- a/servers/mermet/nginx/sourcephile.fr.nix
+++ b/servers/mermet/nginx/sourcephile.fr.nix
@@ -9,7 +9,7 @@ imports = map (m: import m {inherit domain;}) [
   sourcephile.fr/public-inbox.nix
 ];
 security.acme.certs."${domain}" = {
-  postRun = "systemctl try-reload nginx";
+  postRun = "systemctl reload nginx";
 };
 systemd.services.dovecot2 = {
   wants = [ "acme-selfsigned-${domain}.service" "acme-${domain}.service"];
diff --git a/servers/mermet/postfix/autogeree.net.nix b/servers/mermet/postfix/autogeree.net.nix
index 914e9fc..9609404 100644
--- a/servers/mermet/postfix/autogeree.net.nix
+++ b/servers/mermet/postfix/autogeree.net.nix
@@ -59,7 +59,7 @@ services.postfix = {
   };
 };
 security.acme.certs."${domain}" = {
-  postRun = "systemctl try-reload postfix";
+  postRun = "systemctl reload postfix";
 };
 systemd.services.postfix = {
   wants = [ "acme-selfsigned-${domain}.service" "acme-${domain}.service"];
diff --git a/servers/mermet/postfix/sourcephile.fr.nix b/servers/mermet/postfix/sourcephile.fr.nix
index 99607ce..6e25674 100644
--- a/servers/mermet/postfix/sourcephile.fr.nix
+++ b/servers/mermet/postfix/sourcephile.fr.nix
@@ -70,7 +70,7 @@ services.postfix = {
   };
 };
 security.acme.certs."${domain}" = {
-  postRun = "systemctl try-reload postfix";
+  postRun = "systemctl reload postfix";
 };
 systemd.services.postfix = {
   wants = [ "acme-selfsigned-${domain}.service" "acme-${domain}.service"];
-- 
2.47.2