Unverified Commit b23f12e0 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 7c579fd4 413655a1

nixos/modules/services/matrix/appservice-discord.nix

+2 −2
Original line number Diff line number Diff line
@@ -100,9 +100,9 @@ in { 


      serviceDependencies = mkOption {

        type = with types; listOf str;

        default = optional config.services.matrix-synapse.enable "matrix-synapse.service";

        default = optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit;

        defaultText = literalExpression ''

          optional config.services.matrix-synapse.enable "matrix-synapse.service"

          optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit

        '';

        description = lib.mdDoc ''

          List of Systemd services to require and wait for when starting the application service,

nixos/modules/services/matrix/matrix-sliding-sync.nix

+7 −2
Original line number Diff line number Diff line
@@ -80,8 +80,11 @@ in 
      } ];

    };



    systemd.services.matrix-sliding-sync = {

      after = lib.optional cfg.createDatabase "postgresql.service";

    systemd.services.matrix-sliding-sync = rec {

      after =

        lib.optional cfg.createDatabase "postgresql.service"

        ++ lib.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit;

      wants = after;

      wantedBy = [ "multi-user.target" ];

      environment = cfg.settings;

      serviceConfig = {
@@ -90,6 +93,8 @@ in 
        ExecStart = lib.getExe cfg.package;

        StateDirectory = "matrix-sliding-sync";

        WorkingDirectory = "%S/matrix-sliding-sync";

        Restart = "on-failure";

        RestartSec = "1s";

      };

    };

  };

nixos/modules/services/matrix/mautrix-facebook.nix

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ in { 
      wantedBy = [ "multi-user.target" ];

      wants = [

        "network-online.target"

      ] ++ optional config.services.matrix-synapse.enable "matrix-synapse.service"

      ] ++ optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit

        ++ optional cfg.configurePostgresql "postgresql.service";

      after = wants;

nixos/modules/services/matrix/mautrix-telegram.nix

+2 −2
Original line number Diff line number Diff line
@@ -122,9 +122,9 @@ in { 


      serviceDependencies = mkOption {

        type = with types; listOf str;

        default = optional config.services.matrix-synapse.enable "matrix-synapse.service";

        default = optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit;

        defaultText = literalExpression ''

          optional config.services.matrix-synapse.enable "matrix-synapse.service"

          optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit

        '';

        description = lib.mdDoc ''

          List of Systemd services to require and wait for when starting the application service.

nixos/modules/services/matrix/mautrix-whatsapp.nix

+2 −2
Original line number Diff line number Diff line
@@ -100,9 +100,9 @@ in { 


    serviceDependencies = lib.mkOption {

      type = with lib.types; listOf str;

      default = lib.optional config.services.matrix-synapse.enable "matrix-synapse.service";

      default = lib.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit;

      defaultText = lib.literalExpression ''

        optional config.services.matrix-synapse.enable "matrix-synapse.service"

        optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnits

      '';

      description = lib.mdDoc ''

        List of Systemd services to require and wait for when starting the application service.