mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-06 17:13:24 -05:00
treewide: format all inactive Nix files
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.
Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.
A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.
This commit was automatically created and can be verified using
nix-build https://github.com/infinisil/treewide-nixpkgs-reformat-script/archive/a08b3a4d199c6124ac5b36a889d9099b4383463f.tar.gz \
--argstr baseRev b32a094368
result/bin/apply-formatting $NIXPKGS_PATH
This commit is contained in:
Silvan Mosberger
parent
b32a094368
commit
4f0dadbf38
21293 changed files with 706929 additions and 433885 deletions
|
|
@ -1,4 +1,9 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
|
|
@ -17,7 +22,8 @@ let
|
|||
process.stdout.write(JSON.stringify(eval(process.argv[3])));
|
||||
'';
|
||||
userJson = pkgs.writeText "user.json" (builtins.toJSON userCfg);
|
||||
in (pkgs.runCommand "${varName}.js" { } ''
|
||||
in
|
||||
(pkgs.runCommand "${varName}.js" { } ''
|
||||
${pkgs.nodejs}/bin/node ${extractor} ${source} ${varName} > default.json
|
||||
(
|
||||
echo "var ${varName} = "
|
||||
|
|
@ -229,7 +235,7 @@ in
|
|||
proxy65 = mkIf cfg.prosody.lockdown (mkDefault false);
|
||||
};
|
||||
httpInterfaces = mkIf cfg.prosody.lockdown (mkDefault [ "127.0.0.1" ]);
|
||||
httpsPorts = mkIf cfg.prosody.lockdown (mkDefault []);
|
||||
httpsPorts = mkIf cfg.prosody.lockdown (mkDefault [ ]);
|
||||
muc = [
|
||||
{
|
||||
domain = "conference.${cfg.hostName}";
|
||||
|
|
@ -318,26 +324,31 @@ in
|
|||
muc_component = "conference.${cfg.hostName}"
|
||||
breakout_rooms_component = "breakout.${cfg.hostName}"
|
||||
'')
|
||||
(mkBefore (''
|
||||
muc_mapper_domain_base = "${cfg.hostName}"
|
||||
(mkBefore (
|
||||
''
|
||||
muc_mapper_domain_base = "${cfg.hostName}"
|
||||
|
||||
cross_domain_websocket = true;
|
||||
consider_websocket_secure = true;
|
||||
cross_domain_websocket = true;
|
||||
consider_websocket_secure = true;
|
||||
|
||||
unlimited_jids = {
|
||||
"focus@auth.${cfg.hostName}",
|
||||
"jvb@auth.${cfg.hostName}"
|
||||
}
|
||||
'' + optionalString cfg.prosody.lockdown ''
|
||||
c2s_interfaces = { "127.0.0.1" };
|
||||
modules_disabled = { "s2s" };
|
||||
''))
|
||||
unlimited_jids = {
|
||||
"focus@auth.${cfg.hostName}",
|
||||
"jvb@auth.${cfg.hostName}"
|
||||
}
|
||||
''
|
||||
+ optionalString cfg.prosody.lockdown ''
|
||||
c2s_interfaces = { "127.0.0.1" };
|
||||
modules_disabled = { "s2s" };
|
||||
''
|
||||
))
|
||||
];
|
||||
virtualHosts.${cfg.hostName} = {
|
||||
enabled = true;
|
||||
domain = cfg.hostName;
|
||||
extraConfig = ''
|
||||
authentication = ${if cfg.secureDomain.enable then "\"${cfg.secureDomain.authentication}\"" else "\"jitsi-anonymous\""}
|
||||
authentication = ${
|
||||
if cfg.secureDomain.enable then "\"${cfg.secureDomain.authentication}\"" else "\"jitsi-anonymous\""
|
||||
}
|
||||
c2s_require_encryption = false
|
||||
admins = { "focus@auth.${cfg.hostName}" }
|
||||
smacks_max_unacked_stanzas = 5
|
||||
|
|
@ -390,17 +401,24 @@ in
|
|||
};
|
||||
};
|
||||
systemd.services.prosody = mkIf cfg.prosody.enable {
|
||||
preStart = let
|
||||
videobridgeSecret = if cfg.videobridge.passwordFile != null then cfg.videobridge.passwordFile else "/var/lib/jitsi-meet/videobridge-secret";
|
||||
in ''
|
||||
${config.services.prosody.package}/bin/prosodyctl register focus auth.${cfg.hostName} "$(cat /var/lib/jitsi-meet/jicofo-user-secret)"
|
||||
${config.services.prosody.package}/bin/prosodyctl register jvb auth.${cfg.hostName} "$(cat ${videobridgeSecret})"
|
||||
${config.services.prosody.package}/bin/prosodyctl mod_roster_command subscribe focus.${cfg.hostName} focus@auth.${cfg.hostName}
|
||||
${config.services.prosody.package}/bin/prosodyctl register jibri auth.${cfg.hostName} "$(cat /var/lib/jitsi-meet/jibri-auth-secret)"
|
||||
${config.services.prosody.package}/bin/prosodyctl register recorder recorder.${cfg.hostName} "$(cat /var/lib/jitsi-meet/jibri-recorder-secret)"
|
||||
'' + optionalString cfg.jigasi.enable ''
|
||||
${config.services.prosody.package}/bin/prosodyctl register jigasi auth.${cfg.hostName} "$(cat /var/lib/jitsi-meet/jigasi-user-secret)"
|
||||
'';
|
||||
preStart =
|
||||
let
|
||||
videobridgeSecret =
|
||||
if cfg.videobridge.passwordFile != null then
|
||||
cfg.videobridge.passwordFile
|
||||
else
|
||||
"/var/lib/jitsi-meet/videobridge-secret";
|
||||
in
|
||||
''
|
||||
${config.services.prosody.package}/bin/prosodyctl register focus auth.${cfg.hostName} "$(cat /var/lib/jitsi-meet/jicofo-user-secret)"
|
||||
${config.services.prosody.package}/bin/prosodyctl register jvb auth.${cfg.hostName} "$(cat ${videobridgeSecret})"
|
||||
${config.services.prosody.package}/bin/prosodyctl mod_roster_command subscribe focus.${cfg.hostName} focus@auth.${cfg.hostName}
|
||||
${config.services.prosody.package}/bin/prosodyctl register jibri auth.${cfg.hostName} "$(cat /var/lib/jitsi-meet/jibri-auth-secret)"
|
||||
${config.services.prosody.package}/bin/prosodyctl register recorder recorder.${cfg.hostName} "$(cat /var/lib/jitsi-meet/jibri-recorder-secret)"
|
||||
''
|
||||
+ optionalString cfg.jigasi.enable ''
|
||||
${config.services.prosody.package}/bin/prosodyctl register jigasi auth.${cfg.hostName} "$(cat /var/lib/jitsi-meet/jigasi-user-secret)"
|
||||
'';
|
||||
|
||||
serviceConfig = {
|
||||
EnvironmentFile = [ "/var/lib/jitsi-meet/secrets-env" ];
|
||||
|
|
@ -416,7 +434,13 @@ in
|
|||
|
||||
systemd.services.jitsi-meet-init-secrets = {
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
before = [ "jicofo.service" "jitsi-videobridge2.service" ] ++ (optional cfg.prosody.enable "prosody.service") ++ (optional cfg.jigasi.enable "jigasi.service");
|
||||
before =
|
||||
[
|
||||
"jicofo.service"
|
||||
"jitsi-videobridge2.service"
|
||||
]
|
||||
++ (optional cfg.prosody.enable "prosody.service")
|
||||
++ (optional cfg.jigasi.enable "jigasi.service");
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
UMask = "027";
|
||||
|
|
@ -425,34 +449,46 @@ in
|
|||
WorkingDirectory = "/var/lib/jitsi-meet";
|
||||
};
|
||||
|
||||
script = let
|
||||
secrets = [ "jicofo-component-secret" "jicofo-user-secret" "jibri-auth-secret" "jibri-recorder-secret" ] ++ (optionals cfg.jigasi.enable [ "jigasi-user-secret" "jigasi-component-secret" ]) ++ (optional (cfg.videobridge.passwordFile == null) "videobridge-secret");
|
||||
in
|
||||
''
|
||||
${concatMapStringsSep "\n" (s: ''
|
||||
if [ ! -f ${s} ]; then
|
||||
tr -dc a-zA-Z0-9 </dev/urandom | head -c 64 > ${s}
|
||||
fi
|
||||
'') secrets}
|
||||
script =
|
||||
let
|
||||
secrets =
|
||||
[
|
||||
"jicofo-component-secret"
|
||||
"jicofo-user-secret"
|
||||
"jibri-auth-secret"
|
||||
"jibri-recorder-secret"
|
||||
]
|
||||
++ (optionals cfg.jigasi.enable [
|
||||
"jigasi-user-secret"
|
||||
"jigasi-component-secret"
|
||||
])
|
||||
++ (optional (cfg.videobridge.passwordFile == null) "videobridge-secret");
|
||||
in
|
||||
''
|
||||
${concatMapStringsSep "\n" (s: ''
|
||||
if [ ! -f ${s} ]; then
|
||||
tr -dc a-zA-Z0-9 </dev/urandom | head -c 64 > ${s}
|
||||
fi
|
||||
'') secrets}
|
||||
|
||||
# for easy access in prosody
|
||||
echo "JICOFO_COMPONENT_SECRET=$(cat jicofo-component-secret)" > secrets-env
|
||||
echo "JIGASI_COMPONENT_SECRET=$(cat jigasi-component-secret)" >> secrets-env
|
||||
''
|
||||
+ optionalString cfg.prosody.enable ''
|
||||
# generate self-signed certificates
|
||||
if [ ! -f /var/lib/jitsi-meet/jitsi-meet.crt ]; then
|
||||
${getBin pkgs.openssl}/bin/openssl req \
|
||||
-x509 \
|
||||
-newkey rsa:4096 \
|
||||
-keyout /var/lib/jitsi-meet/jitsi-meet.key \
|
||||
-out /var/lib/jitsi-meet/jitsi-meet.crt \
|
||||
-days 36500 \
|
||||
-nodes \
|
||||
-subj '/CN=${cfg.hostName}/CN=auth.${cfg.hostName}'
|
||||
chmod 640 /var/lib/jitsi-meet/jitsi-meet.key
|
||||
fi
|
||||
'';
|
||||
# for easy access in prosody
|
||||
echo "JICOFO_COMPONENT_SECRET=$(cat jicofo-component-secret)" > secrets-env
|
||||
echo "JIGASI_COMPONENT_SECRET=$(cat jigasi-component-secret)" >> secrets-env
|
||||
''
|
||||
+ optionalString cfg.prosody.enable ''
|
||||
# generate self-signed certificates
|
||||
if [ ! -f /var/lib/jitsi-meet/jitsi-meet.crt ]; then
|
||||
${getBin pkgs.openssl}/bin/openssl req \
|
||||
-x509 \
|
||||
-newkey rsa:4096 \
|
||||
-keyout /var/lib/jitsi-meet/jitsi-meet.key \
|
||||
-out /var/lib/jitsi-meet/jitsi-meet.crt \
|
||||
-days 36500 \
|
||||
-nodes \
|
||||
-subj '/CN=${cfg.hostName}/CN=auth.${cfg.hostName}'
|
||||
chmod 640 /var/lib/jitsi-meet/jitsi-meet.key
|
||||
fi
|
||||
'';
|
||||
};
|
||||
|
||||
systemd.services.jitsi-excalidraw = mkIf cfg.excalidraw.enable {
|
||||
|
|
@ -482,12 +518,18 @@ in
|
|||
ProtectKernelTunables = true;
|
||||
ProtectKernelModules = true;
|
||||
ProtectControlGroups = true;
|
||||
RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ];
|
||||
RestrictAddressFamilies = [
|
||||
"AF_INET"
|
||||
"AF_INET6"
|
||||
];
|
||||
RestrictNamespaces = true;
|
||||
LockPersonality = true;
|
||||
RestrictRealtime = true;
|
||||
RestrictSUIDSGID = true;
|
||||
SystemCallFilter = [ "@system-service @pkey" "~@privileged" ];
|
||||
SystemCallFilter = [
|
||||
"@system-service @pkey"
|
||||
"~@privileged"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
|
|
@ -527,10 +569,14 @@ in
|
|||
'';
|
||||
};
|
||||
locations."=/config.js" = mkDefault {
|
||||
alias = overrideJs "${pkgs.jitsi-meet}/config.js" "config" (recursiveUpdate defaultCfg cfg.config) cfg.extraConfig;
|
||||
alias =
|
||||
overrideJs "${pkgs.jitsi-meet}/config.js" "config" (recursiveUpdate defaultCfg cfg.config)
|
||||
cfg.extraConfig;
|
||||
};
|
||||
locations."=/interface_config.js" = mkDefault {
|
||||
alias = overrideJs "${pkgs.jitsi-meet}/interface_config.js" "interfaceConfig" cfg.interfaceConfig "";
|
||||
alias =
|
||||
overrideJs "${pkgs.jitsi-meet}/interface_config.js" "interfaceConfig" cfg.interfaceConfig
|
||||
"";
|
||||
};
|
||||
locations."/socket.io/" = mkIf cfg.excalidraw.enable {
|
||||
proxyPass = "http://127.0.0.1:${toString cfg.excalidraw.port}";
|
||||
|
|
@ -543,52 +589,62 @@ in
|
|||
enable = mkDefault true;
|
||||
virtualHosts.${cfg.hostName} = {
|
||||
extraConfig =
|
||||
let
|
||||
templatedJitsiMeet = pkgs.runCommand "templated-jitsi-meet" { } ''
|
||||
cp -R --no-preserve=all ${pkgs.jitsi-meet}/* .
|
||||
for file in *.html **/*.html ; do
|
||||
${pkgs.sd}/bin/sd '<!--#include virtual="(.*)" -->' '{{ include "$1" }}' $file
|
||||
done
|
||||
rm config.js
|
||||
rm interface_config.js
|
||||
cp -R . $out
|
||||
cp ${overrideJs "${pkgs.jitsi-meet}/config.js" "config" (recursiveUpdate defaultCfg cfg.config) cfg.extraConfig} $out/config.js
|
||||
cp ${overrideJs "${pkgs.jitsi-meet}/interface_config.js" "interfaceConfig" cfg.interfaceConfig ""} $out/interface_config.js
|
||||
cp ./libs/external_api.min.js $out/external_api.js
|
||||
let
|
||||
templatedJitsiMeet = pkgs.runCommand "templated-jitsi-meet" { } ''
|
||||
cp -R --no-preserve=all ${pkgs.jitsi-meet}/* .
|
||||
for file in *.html **/*.html ; do
|
||||
${pkgs.sd}/bin/sd '<!--#include virtual="(.*)" -->' '{{ include "$1" }}' $file
|
||||
done
|
||||
rm config.js
|
||||
rm interface_config.js
|
||||
cp -R . $out
|
||||
cp ${
|
||||
overrideJs "${pkgs.jitsi-meet}/config.js" "config" (recursiveUpdate defaultCfg cfg.config)
|
||||
cfg.extraConfig
|
||||
} $out/config.js
|
||||
cp ${
|
||||
overrideJs "${pkgs.jitsi-meet}/interface_config.js" "interfaceConfig" cfg.interfaceConfig ""
|
||||
} $out/interface_config.js
|
||||
cp ./libs/external_api.min.js $out/external_api.js
|
||||
'';
|
||||
in
|
||||
(optionalString cfg.excalidraw.enable ''
|
||||
handle /socket.io/ {
|
||||
reverse_proxy 127.0.0.1:${toString cfg.excalidraw.port}
|
||||
}
|
||||
'')
|
||||
+ ''
|
||||
handle /http-bind {
|
||||
header Host ${cfg.hostName}
|
||||
reverse_proxy 127.0.0.1:5280
|
||||
}
|
||||
handle /xmpp-websocket {
|
||||
reverse_proxy 127.0.0.1:5280
|
||||
}
|
||||
handle {
|
||||
templates
|
||||
root * ${templatedJitsiMeet}
|
||||
try_files {path} {path}
|
||||
try_files {path} /index.html
|
||||
file_server
|
||||
}
|
||||
'';
|
||||
in (optionalString cfg.excalidraw.enable ''
|
||||
handle /socket.io/ {
|
||||
reverse_proxy 127.0.0.1:${toString cfg.excalidraw.port}
|
||||
}
|
||||
'') + ''
|
||||
handle /http-bind {
|
||||
header Host ${cfg.hostName}
|
||||
reverse_proxy 127.0.0.1:5280
|
||||
}
|
||||
handle /xmpp-websocket {
|
||||
reverse_proxy 127.0.0.1:5280
|
||||
}
|
||||
handle {
|
||||
templates
|
||||
root * ${templatedJitsiMeet}
|
||||
try_files {path} {path}
|
||||
try_files {path} /index.html
|
||||
file_server
|
||||
}
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
services.jitsi-meet.config = recursiveUpdate
|
||||
(mkIf cfg.excalidraw.enable {
|
||||
whiteboard = {
|
||||
enabled = true;
|
||||
collabServerBaseUrl = "https://${cfg.hostName}";
|
||||
};
|
||||
})
|
||||
(mkIf cfg.secureDomain.enable {
|
||||
hosts.anonymousdomain = "guest.${cfg.hostName}";
|
||||
});
|
||||
services.jitsi-meet.config =
|
||||
recursiveUpdate
|
||||
(mkIf cfg.excalidraw.enable {
|
||||
whiteboard = {
|
||||
enabled = true;
|
||||
collabServerBaseUrl = "https://${cfg.hostName}";
|
||||
};
|
||||
})
|
||||
(
|
||||
mkIf cfg.secureDomain.enable {
|
||||
hosts.anonymousdomain = "guest.${cfg.hostName}";
|
||||
}
|
||||
);
|
||||
|
||||
services.jitsi-videobridge = mkIf cfg.videobridge.enable {
|
||||
enable = true;
|
||||
|
|
@ -610,10 +666,11 @@ in
|
|||
userPasswordFile = "/var/lib/jitsi-meet/jicofo-user-secret";
|
||||
componentPasswordFile = "/var/lib/jitsi-meet/jicofo-component-secret";
|
||||
bridgeMuc = "jvbbrewery@internal.auth.${cfg.hostName}";
|
||||
config = mkMerge [{
|
||||
jicofo.xmpp.service.disable-certificate-verification = true;
|
||||
jicofo.xmpp.client.disable-certificate-verification = true;
|
||||
}
|
||||
config = mkMerge [
|
||||
{
|
||||
jicofo.xmpp.service.disable-certificate-verification = true;
|
||||
jicofo.xmpp.client.disable-certificate-verification = true;
|
||||
}
|
||||
(lib.mkIf (config.services.jibri.enable || cfg.jibri.enable) {
|
||||
jicofo.jibri = {
|
||||
brewery-jid = "JibriBrewery@internal.auth.${cfg.hostName}";
|
||||
|
|
@ -629,7 +686,8 @@ in
|
|||
};
|
||||
xmpp.client.client-proxy = "focus.${cfg.hostName}";
|
||||
};
|
||||
})];
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
services.jibri = mkIf cfg.jibri.enable {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue