diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
index 3d7e5b19d6ce..1cfef8254891 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
@@ -252,6 +252,13 @@
set autoSubUidGidRange = true.
+
+
+ services.thelounge.private was removed in
+ favor of services.thelounge.public, to
+ follow with upstream changes.
+
+
diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md
index 52e19c381046..181630263217 100644
--- a/nixos/doc/manual/release-notes/rl-2205.section.md
+++ b/nixos/doc/manual/release-notes/rl-2205.section.md
@@ -83,6 +83,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- Normal users (with `isNormalUser = true`) which have non-empty `subUidRanges` or `subGidRanges` set no longer have additional implicit ranges allocated. To enable automatic allocation back set `autoSubUidGidRange = true`.
+- `services.thelounge.private` was removed in favor of `services.thelounge.public`, to follow with upstream changes.
+
## Other Notable Changes {#sec-release-22.05-notable-changes}
- The option [services.redis.servers](#opt-services.redis.servers) was added
diff --git a/nixos/modules/services/networking/thelounge.nix b/nixos/modules/services/networking/thelounge.nix
index 9a366c97fcb6..a5118fd8b339 100644
--- a/nixos/modules/services/networking/thelounge.nix
+++ b/nixos/modules/services/networking/thelounge.nix
@@ -6,7 +6,7 @@ let
cfg = config.services.thelounge;
dataDir = "/var/lib/thelounge";
configJsData = "module.exports = " + builtins.toJSON (
- { private = cfg.private; port = cfg.port; } // cfg.extraConfig
+ { inherit (cfg) public port; } // cfg.extraConfig
);
pluginManifest = {
dependencies = builtins.listToAttrs (builtins.map (pkg: { name = getName pkg; value = getVersion pkg; }) cfg.plugins);
@@ -20,14 +20,17 @@ let
'';
in
{
+ imports = [ (mkRemovedOptionModule [ "services" "thelounge" "private" ] "The option was renamed to `services.thelounge.public` to follow upstream changes.") ];
+
options.services.thelounge = {
enable = mkEnableOption "The Lounge web IRC client";
- private = mkOption {
+ public = mkOption {
type = types.bool;
default = false;
description = ''
- Make your The Lounge instance private. You will need to configure user
+ Make your The Lounge instance public.
+ Setting this to false will require you to configure user
accounts by using the (thelounge) command or by adding
entries in ${dataDir}/users. You might need to restart
The Lounge after making changes to the state directory.
@@ -79,7 +82,9 @@ in
group = "thelounge";
isSystemUser = true;
};
+
users.groups.thelounge = { };
+
systemd.services.thelounge = {
description = "The Lounge web IRC client";
wantedBy = [ "multi-user.target" ];