From 054d6d9182eeb1bb3f88fc1a3063d8df239852f3 Mon Sep 17 00:00:00 2001 From: Alexander Tomokhov Date: Mon, 4 Dec 2023 15:43:06 +0400 Subject: [PATCH] move jitsi-meet to SP module --- configuration.nix | 1 - .../jitsi-meet/config-paths-needed.json | 4 ++++ sp-modules/jitsi-meet/flake.nix | 9 ++++++++ sp-modules/jitsi-meet/module.nix | 21 +++++++++++++++++++ userdata-variables.nix | 3 --- variables-module.nix | 6 ------ videomeet/jitsi.nix | 12 ----------- 7 files changed, 34 insertions(+), 22 deletions(-) create mode 100644 sp-modules/jitsi-meet/config-paths-needed.json create mode 100644 sp-modules/jitsi-meet/flake.nix create mode 100644 sp-modules/jitsi-meet/module.nix delete mode 100644 videomeet/jitsi.nix diff --git a/configuration.nix b/configuration.nix index b2d0e98..525c4e6 100644 --- a/configuration.nix +++ b/configuration.nix @@ -9,7 +9,6 @@ ./webserver/nginx.nix ./webserver/memcached.nix # ./resources/limits.nix - ./videomeet/jitsi.nix ./git/gitea.nix ]; diff --git a/sp-modules/jitsi-meet/config-paths-needed.json b/sp-modules/jitsi-meet/config-paths-needed.json new file mode 100644 index 0000000..e44e0bc --- /dev/null +++ b/sp-modules/jitsi-meet/config-paths-needed.json @@ -0,0 +1,4 @@ +[ + [ "selfprivacy", "domain" ], + [ "selfprivacy", "modules", "jitsi-meet" ] +] diff --git a/sp-modules/jitsi-meet/flake.nix b/sp-modules/jitsi-meet/flake.nix new file mode 100644 index 0000000..e93ae96 --- /dev/null +++ b/sp-modules/jitsi-meet/flake.nix @@ -0,0 +1,9 @@ +{ + description = "PoC SP module for Jitsi Meet video conferences server"; + + outputs = { self }: { + nixosModules.default = import ./module.nix; + configPathsNeeded = + builtins.fromJSON (builtins.readFile ./config-paths-needed.json); + }; +} diff --git a/sp-modules/jitsi-meet/module.nix b/sp-modules/jitsi-meet/module.nix new file mode 100644 index 0000000..238dffc --- /dev/null +++ b/sp-modules/jitsi-meet/module.nix @@ -0,0 +1,21 @@ +{ config, lib, ... }: +{ + options.selfprivacy.modules.jitsi-meet = { + enable = lib.mkOption { + default = false; + type = with lib.types; nullOr bool; + }; + }; + + config = lib.mkIf config.selfprivacy.modules.jitsi-meet.enable { + services.jitsi-meet = { + enable = true; + hostName = "meet.${config.selfprivacy.domain}"; + nginx.enable = true; + interfaceConfig = { + SHOW_JITSI_WATERMARK = false; + SHOW_WATERMARK_FOR_GUESTS = false; + }; + }; + }; +} diff --git a/userdata-variables.nix b/userdata-variables.nix index d7df053..baa23f8 100644 --- a/userdata-variables.nix +++ b/userdata-variables.nix @@ -22,9 +22,6 @@ jsonData: { lib, ... }: enable = lib.attrsets.attrByPath [ "gitea" "enable" ] false jsonData; location = lib.attrsets.attrByPath [ "gitea" "location" ] "sda1" jsonData; }; - jitsi = { - enable = lib.attrsets.attrByPath [ "jitsi" "enable" ] false jsonData; - }; ssh = { enable = lib.attrsets.attrByPath [ "ssh" "enable" ] true jsonData; rootKeys = lib.attrsets.attrByPath [ "ssh" "rootKeys" ] [ "" ] jsonData; diff --git a/variables-module.nix b/variables-module.nix index fc407ec..92c6b5e 100644 --- a/variables-module.nix +++ b/variables-module.nix @@ -125,12 +125,6 @@ with lib; type = types.nullOr types.str; }; }; - jitsi = { - enable = mkOption { - default = false; - type = types.nullOr types.bool; - }; - }; ######### # SSH # ######### diff --git a/videomeet/jitsi.nix b/videomeet/jitsi.nix deleted file mode 100644 index 825df75..0000000 --- a/videomeet/jitsi.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ config, ... }: -{ - services.jitsi-meet = { - enable = config.selfprivacy.jitsi.enable; - hostName = "meet.${config.selfprivacy.domain}"; - nginx.enable = true; - interfaceConfig = { - SHOW_JITSI_WATERMARK = false; - SHOW_WATERMARK_FOR_GUESTS = false; - }; - }; -}