Commit 2c8e67bf authored by Brian Leung's avatar Brian Leung Committed by Yt
Browse files

nixos/lemmy: settings.database.createLocally -> database.createLocally



Co-authored-by: default avatarShahar Dawn Or <mightyiampresence@gmail.com>
Co-authored-by: default avatarCtem <c@ctem.me>
Co-authored-by: default avatara-kenji <aks.kenji@protonmail.com>
parent d15db11d
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -484,6 +484,14 @@
          <literal>services.datadog-agent</literal> module.
        </para>
      </listitem>
      <listitem>
        <para>
          lemmy module option
          <literal>services.lemmy.settings.database.createLocally</literal>
          moved to
          <literal>services.lemmy.database.createLocally</literal>.
        </para>
      </listitem>
      <listitem>
        <para>
          virtlyst package and <literal>services.virtlyst</literal>
+3 −0
Original line number Diff line number Diff line
@@ -166,6 +166,9 @@ Available as [services.patroni](options.html#opt-services.patroni.enable).

- dd-agent package removed along with the `services.dd-agent` module, due to the project being deprecated in favor of `datadog-agent`,  which is available via the `services.datadog-agent` module.

- lemmy module option `services.lemmy.settings.database.createLocally`
  moved to `services.lemmy.database.createLocally`.

- virtlyst package and `services.virtlyst` module removed, due to lack of maintainers.

- The `services.graphite.api` and `services.graphite.beacon` NixOS options, and
+6 −7
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ in

    caddy.enable = mkEnableOption (lib.mdDoc "exposing lemmy with the caddy reverse proxy");

    database.createLocally = mkEnableOption (lib.mdDoc "creation of database on the instance");

    settings = mkOption {
      default = { };
      description = lib.mdDoc "Lemmy configuration";
@@ -63,9 +65,6 @@ in
            description = lib.mdDoc "The difficultly of the captcha to solve.";
          };
        };

        options.database.createLocally = mkEnableOption (lib.mdDoc "creation of database on the instance");

      };
    };

@@ -142,7 +141,7 @@ in
      };

      assertions = [{
        assertion = cfg.settings.database.createLocally -> localPostgres;
        assertion = cfg.database.createLocally -> localPostgres;
        message = "if you want to create the database locally, you need to use a local database";
      }];

@@ -163,9 +162,9 @@ in

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

        after = [ "pict-rs.service" ] ++ lib.optionals cfg.settings.database.createLocally [ "lemmy-postgresql.service" ];
        after = [ "pict-rs.service" ] ++ lib.optionals cfg.database.createLocally [ "lemmy-postgresql.service" ];

        requires = lib.optionals cfg.settings.database.createLocally [ "lemmy-postgresql.service" ];
        requires = lib.optionals cfg.database.createLocally [ "lemmy-postgresql.service" ];

        serviceConfig = {
          DynamicUser = true;
@@ -203,7 +202,7 @@ in
        };
      };

      systemd.services.lemmy-postgresql = mkIf cfg.settings.database.createLocally {
      systemd.services.lemmy-postgresql = mkIf cfg.database.createLocally {
        description = "Lemmy postgresql db";
        after = [ "postgresql.service" ];
        partOf = [ "lemmy.service" ];
+1 −1
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ in
      services.lemmy = {
        enable = true;
        ui.port = uiPort;
        database.createLocally = true;
        settings = {
          hostname = "http://${lemmyNodeName}";
          port = backendPort;
          database.createLocally = true;
          # Without setup, the /feeds/* and /nodeinfo/* API endpoints won't return 200
          setup = {
            admin_username = "mightyiam";