treewide: use requires instead of after for most situations

Signed-off-by: Sumner Evans <[email protected]>
nevarro-space · Apr 2, 2024 · e6c2fbb · e6c2fbb
1 parent a8bbf43
commit e6c2fbb
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 13 deletions.
diff --git a/nixos/hosts/mineshspc/default.nix b/nixos/hosts/mineshspc/default.nix
@@ -36,7 +36,7 @@ in {
 
   systemd.services."mineshspc.com" = {
     description = "Mines HSPC Website service";
-    after = [ "network-online.target" "mineshspc_env-key.service" ];
+    requires = [ "network-online.target" "mineshspc_env-key.service" ];
     wantedBy = [ "multi-user.target" ];
     serviceConfig = {
       WorkingDirectory = dataDir;

diff --git a/nixos/modules/services/matrix/linkedin-matrix.nix b/nixos/modules/services/matrix/linkedin-matrix.nix
@@ -225,7 +225,7 @@ in {
 
     systemd.services.linkedin-matrix = {
       description = "LinkedIn Messaging <-> Matrix Bridge";
-      after = [ "appservice_login_shared_secret_yaml-key.service" ]
+      requires = [ "appservice_login_shared_secret_yaml-key.service" ]
         ++ optional cfg.useLocalSynapse "matrix-synapse.target";
       wantedBy = [ "multi-user.target" ];
       preStart = ''

diff --git a/nixos/modules/services/matrix/matrix-chessbot.nix b/nixos/modules/services/matrix/matrix-chessbot.nix
@@ -29,7 +29,7 @@ in {
   config = mkIf cfg.enable {
     systemd.services.matrix-chessbot = {
       description = "Matrix Chessbot";
-      after = [ "matrix-synapse.target" "chessbot_password-key.service" ];
+      requires = [ "matrix-synapse.target" "chessbot_password-key.service" ];
       wantedBy = [ "multi-user.target" ];
       path = [ pkgs.imagemagick ];
       serviceConfig = {

diff --git a/nixos/modules/services/matrix/maubot-echo.nix b/nixos/modules/services/matrix/maubot-echo.nix
@@ -55,7 +55,7 @@ in {
   config = mkIf cfg.enable {
     systemd.services.maubot-echo = {
       description = "Echo Maubot";
-      after =
+      requires =
         [ "matrix-synapse.target" "echo_maubot_secrets_yaml-key.service" ];
       wantedBy = [ "multi-user.target" ];
       preStart = ''

diff --git a/nixos/modules/services/matrix/maubot-github.nix b/nixos/modules/services/matrix/maubot-github.nix
@@ -335,7 +335,7 @@ in {
   config = mkIf cfg.enable {
     systemd.services.maubot-github = {
       description = "GitHub Maubot";
-      after = [
+      requires = [
         "network.target"
         "postgresql.service"
         "matrix-synapse.target"

diff --git a/nixos/modules/services/matrix/mautrix-discord.nix b/nixos/modules/services/matrix/mautrix-discord.nix
@@ -191,7 +191,7 @@ in {
     systemd.services.mautrix-discord = {
       description = "Discord <-> Matrix Bridge";
       wantedBy = [ "multi-user.target" ];
-      after = [ "appservice_login_shared_secret_yaml-key.service" ]
+      requires = [ "appservice_login_shared_secret_yaml-key.service" ]
         ++ optional cfg.useLocalSynapse "matrix-synapse.target";
       preStart = ''
         ${pkgs.yq-go}/bin/yq ea '. as $item ireduce ({}; . * $item )' \

diff --git a/nixos/modules/services/matrix/mautrix-signal.nix b/nixos/modules/services/matrix/mautrix-signal.nix
@@ -186,7 +186,7 @@ in {
     systemd.services.mautrix-signal = {
       description = "Signal <-> Matrix Bridge";
       wantedBy = [ "multi-user.target" ];
-      after = [ "appservice_login_shared_secret_yaml-key.service" ]
+      requires = [ "appservice_login_shared_secret_yaml-key.service" ]
         ++ optional cfg.useLocalSynapse "matrix-synapse.target";
       preStart = ''
         ${pkgs.yq-go}/bin/yq ea '. as $item ireduce ({}; . * $item )' \

diff --git a/nixos/modules/services/matrix/mautrix-slack.nix b/nixos/modules/services/matrix/mautrix-slack.nix
@@ -201,7 +201,7 @@ in {
     systemd.services.mautrix-slack = {
       description = "Slack <-> Matrix Bridge";
       wantedBy = [ "multi-user.target" ];
-      after = [ "appservice_login_shared_secret_yaml-key.service" ]
+      requires = [ "appservice_login_shared_secret_yaml-key.service" ]
         ++ optional cfg.useLocalSynapse "matrix-synapse.target";
       preStart = ''
         ${pkgs.yq-go}/bin/yq ea '. as $item ireduce ({}; . * $item )' \

diff --git a/nixos/modules/services/matrix/meetbot.nix b/nixos/modules/services/matrix/meetbot.nix
@@ -44,7 +44,7 @@ in {
   config = mkIf cfg.enable {
     systemd.services.meetbot = {
       description = "Meetbot";
-      after = [ "matrix-synapse.target" "meetbot_secret_env-key.service" ];
+      requires = [ "matrix-synapse.target" "meetbot_secret_env-key.service" ];
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         ExecStart = ''

diff --git a/nixos/modules/services/matrix/mjolnir.nix b/nixos/modules/services/matrix/mjolnir.nix
@@ -17,7 +17,7 @@ in mkIf mjolnirCfg.enable {
     };
   };
   systemd.services.mjolnir = {
-    after = [ "matrix-synapse.target" "marshal_password-key.service" ];
+    requires = [ "matrix-synapse.target" "marshal_password-key.service" ];
     serviceConfig.SupplementaryGroups = [ "keys" ];
   };
   services.pantalaimon-headless.instances.mjolnir = {

diff --git a/nixos/modules/services/matrix/msclinkbot.nix b/nixos/modules/services/matrix/msclinkbot.nix
@@ -44,7 +44,7 @@ in {
   config = mkIf cfg.enable {
     systemd.services.msclinkbot = {
       description = "MSC Link Bot";
-      after = [ "matrix-synapse.target" "mscbot_password-key.service" ];
+      requires = [ "matrix-synapse.target" "mscbot_password-key.service" ];
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         ExecStart = ''

diff --git a/nixos/modules/services/matrix/standupbot.nix b/nixos/modules/services/matrix/standupbot.nix
@@ -29,7 +29,7 @@ in {
   config = mkIf cfg.enable {
     systemd.services.standupbot = {
       description = "Standupbot";
-      after = [ "matrix-synapse.target" ];
+      requires = [ "matrix-synapse.target" ];
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         ExecStart = ''

diff --git a/nixos/modules/services/matrix/synapse/default.nix b/nixos/modules/services/matrix/synapse/default.nix
@@ -203,7 +203,7 @@ in {
 
     systemd.targets.matrix-synapse = {
       description = "Synapse processes";
-      after = [ "network.target" "postgresql.service" ];
+      requires = [ "network.target" "postgresql.service" ];
       wantedBy = [ "multi-user.target" ];
     };