diff options
author | Martin Weinelt <mweinelt@users.noreply.github.com> | 2022-01-10 11:46:46 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-10 11:46:46 +0100 |
commit | c61a33bc8bcc3cb7c5dcfb302b6642a57483ced9 (patch) | |
tree | 94c2011b08b168f8aa38b6c039701dfaaf526907 /nixos | |
parent | f26376db62b4c4f2c608e82fdf6cdd2ca7c9ebdb (diff) | |
parent | 38e1dbd942d63cc8712d9f949c126f1fcdde59df (diff) | |
download | nixpkgs-c61a33bc8bcc3cb7c5dcfb302b6642a57483ced9.tar nixpkgs-c61a33bc8bcc3cb7c5dcfb302b6642a57483ced9.tar.gz nixpkgs-c61a33bc8bcc3cb7c5dcfb302b6642a57483ced9.tar.bz2 nixpkgs-c61a33bc8bcc3cb7c5dcfb302b6642a57483ced9.tar.lz nixpkgs-c61a33bc8bcc3cb7c5dcfb302b6642a57483ced9.tar.xz nixpkgs-c61a33bc8bcc3cb7c5dcfb302b6642a57483ced9.tar.zst nixpkgs-c61a33bc8bcc3cb7c5dcfb302b6642a57483ced9.zip |
Merge pull request #129559 from fortuneteller2k/thelounge
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/doc/manual/from_md/release-notes/rl-2205.section.xml | 7 | ||||
-rw-r--r-- | nixos/doc/manual/release-notes/rl-2205.section.md | 2 | ||||
-rw-r--r-- | nixos/modules/services/networking/thelounge.nix | 11 |
3 files changed, 17 insertions, 3 deletions
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 3d7e5b19d6c..1cfef825489 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 <literal>autoSubUidGidRange = true</literal>. </para> </listitem> + <listitem> + <para> + <literal>services.thelounge.private</literal> was removed in + favor of <literal>services.thelounge.public</literal>, to + follow with upstream changes. + </para> + </listitem> </itemizedlist> </section> <section xml:id="sec-release-22.05-notable-changes"> diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index 52e19c38104..18163026321 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 9a366c97fcb..a5118fd8b33 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 <literal>false</literal> will require you to configure user accounts by using the (<command>thelounge</command>) command or by adding entries in <filename>${dataDir}/users</filename>. 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" ]; |