Fachschaft/nixConfig
5
2
Fork 2
Code Issues 7 Pull requests Projects 1 Wiki Activity

ghatanothoa: Neues Jitsi #17

Merged
nerf merged 3 commits from Gonne/nixConfig:ghatanothoa into main 2023-10-23 18:14:57 +00:00
Conversation 0 Commits 3 Files changed 4 +61 -25
3 changed files with 61 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit bb93d3aed5 - Show all commits

8
nixos/machines/ghatanothoa/configuration.nix
View file

@ -3,13 +3,17 @@ flake-inputs:
imports = [
./hardware-configuration.nix
(import ./jitsi.nix flake-inputs)
../../modules/jitsi.nix
nerf marked this conversation as resolved Outdated
nerf commented 2023-10-21 09:13:26 +00:00
Outdated
Review
Copy link

jitsi.nix does not use flake-inputs ever, why not scratch that parameter from the module and don't apply it here

jitsi.nix does not use flake-inputs ever, why not scratch that parameter from the module and don't apply it here
../../roles
./network.nix
];
# System configuration here
services.mathebau-jitsi = {
enable = true;
hostName = "meet.mathebau.de";
};
# System configuration here
networking.hostName = "ghatanothoa";
system.stateVersion = "23.11";
}

23
nixos/machines/ghatanothoa/jitsi.nix
View file

@ -1,23 +0,0 @@
flake-inputs:
{pkgs, config, lib, modulesPath, ...}: {
imports = [(modulesPath + "/services/web-apps/jitsi-meet.nix")];
services.jitsi-meet = {
enable = true;
hostName = "meet.mathebau.de";
config = {
defaultLang = "de";
};
};
services.jitsi-videobridge = {
openFirewall = true;
nat = {
publicAddress = "130.83.2.184";
localAddress = "192.168.0.25";
};
};
services.nginx.virtualHosts."meet.mathebau.de".enableACME = false;
services.nginx.virtualHosts."meet.mathebau.de".forceSSL = false;
networking.firewall.allowedTCPPorts = [ 80 443 ];
networking.firewall.allowedUDPPorts = [ 10000 ];
}

55
nixos/modules/jitsi.nix Normal file
View file

@ -0,0 +1,55 @@
{pkgs, config, lib, modulesPath, ...}:
let
inherit (lib)
mkIf
mkEnableOption
mkOption
head;
inherit (lib.types) str;
cfg = config.services.mathebau-jitsi;
in
{
imports = [(modulesPath + "/services/web-apps/jitsi-meet.nix")];
options.services.mathebau-jitsi = {
enable = mkEnableOption "mathebau jitsi service";
hostName = mkOption {
type = str;
};
Gonne marked this conversation as resolved Outdated
nerf commented 2023-10-23 16:17:42 +00:00
Outdated
Review
Copy link

I think setting default = null; is not the same as setting no default.
I guess you want no default so just delete the line.
(See lengthy reference)

I think setting `default = null;` is not the same as setting no default. I guess you want no default so just delete the line. (See [lengthy reference](https://nixos.org/nixos/manual/#sec-writing-modules))
localAddress = mkOption {
type = str;
default = (head config.networking.interfaces.enX0.ipv4.addresses).address;
};
};
config = mkIf cfg.enable {
services.jitsi-meet = {
enable = true;
hostName = cfg.hostName;
config = {
defaultLang = "de";
};
};
services.jitsi-videobridge = {
openFirewall = true;
nat = {
publicAddress = "130.83.2.184";
localAddress = cfg.localAddress;
};
};
environment.persistence.${config.impermanence.name} = {
directories = [
"/var/lib/jitsi-meet"
"/var/lib/prosody"
];
};
#We are behind a reverse proxy that handles TLS
services.nginx.virtualHosts."${cfg.hostName}" = {
enableACME = false;
forceSSL = false;
};
#The network ports for HTTP(S) are not opened automatically
networking.firewall.allowedTCPPorts = [ 80 443 ];
};
}