From 2c8e67bf6b88d8cffc67cdbfbc018061388f2b64 Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@posteo.net>
Date: Mon, 19 Sep 2022 00:09:38 -0700
Subject: [PATCH] nixos/lemmy: settings.database.createLocally ->
 database.createLocally

Co-authored-by: Shahar Dawn Or <mightyiampresence@gmail.com>
Co-authored-by: Ctem <c@ctem.me>
Co-authored-by: a-kenji <aks.kenji@protonmail.com>
---
 .../from_md/release-notes/rl-2211.section.xml       |  8 ++++++++
 nixos/doc/manual/release-notes/rl-2211.section.md   |  3 +++
 nixos/modules/services/web-apps/lemmy.nix           | 13 ++++++-------
 nixos/tests/lemmy.nix                               |  2 +-
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
index d721fb5dd83b..6c4bc01cc16b 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml
@@ -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>
diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md
index 53f26c4ccc21..720603ef1ad8 100644
--- a/nixos/doc/manual/release-notes/rl-2211.section.md
+++ b/nixos/doc/manual/release-notes/rl-2211.section.md
@@ -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
diff --git a/nixos/modules/services/web-apps/lemmy.nix b/nixos/modules/services/web-apps/lemmy.nix
index 7f619489893e..925156e7c4ab 100644
--- a/nixos/modules/services/web-apps/lemmy.nix
+++ b/nixos/modules/services/web-apps/lemmy.nix
@@ -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" ];
diff --git a/nixos/tests/lemmy.nix b/nixos/tests/lemmy.nix
index a317b4cf15ba..fb64daa80e64 100644
--- a/nixos/tests/lemmy.nix
+++ b/nixos/tests/lemmy.nix
@@ -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";