diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-07-28 12:02:23 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-28 12:02:23 +0000 |
| commit | 437247fc43214bb3c33f2e8f612cdbc206236a97 (patch) | |
| tree | 9173ddae081be5f05a4f83958a86229098b9a800 /nixos | |
| parent | a802ad3445129b7ace80ee0d1f930e6c2081f13f (diff) | |
| parent | 0d7024ccd8ee71ef31b23c724b1d3d197c533015 (diff) | |
| download | nixpkgs-437247fc43214bb3c33f2e8f612cdbc206236a97.tar nixpkgs-437247fc43214bb3c33f2e8f612cdbc206236a97.tar.gz nixpkgs-437247fc43214bb3c33f2e8f612cdbc206236a97.tar.bz2 nixpkgs-437247fc43214bb3c33f2e8f612cdbc206236a97.tar.lz nixpkgs-437247fc43214bb3c33f2e8f612cdbc206236a97.tar.xz nixpkgs-437247fc43214bb3c33f2e8f612cdbc206236a97.tar.zst nixpkgs-437247fc43214bb3c33f2e8f612cdbc206236a97.zip | |
Merge staging-next into staging
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/audio/hqplayerd.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/audio/roon-server.nix | 4 | ||||
| -rw-r--r-- | nixos/modules/services/misc/gitea.nix | 10 | ||||
| -rw-r--r-- | nixos/tests/kea.nix | 2 |
4 files changed, 11 insertions, 7 deletions
diff --git a/nixos/modules/services/audio/hqplayerd.nix b/nixos/modules/services/audio/hqplayerd.nix index 416d12ce217..822a8abef24 100644 --- a/nixos/modules/services/audio/hqplayerd.nix +++ b/nixos/modules/services/audio/hqplayerd.nix @@ -133,7 +133,7 @@ in users.users = { hqplayer = { description = "hqplayer daemon user"; - extraGroups = [ "audio" ]; + extraGroups = [ "audio" "video" ]; group = "hqplayer"; uid = config.ids.uids.hqplayer; }; diff --git a/nixos/modules/services/audio/roon-server.nix b/nixos/modules/services/audio/roon-server.nix index de1f61c8e73..c8a2071c155 100644 --- a/nixos/modules/services/audio/roon-server.nix +++ b/nixos/modules/services/audio/roon-server.nix @@ -53,10 +53,12 @@ in { networking.firewall = mkIf cfg.openFirewall { allowedTCPPortRanges = [ { from = 9100; to = 9200; } - { from = 9330; to = 9332; } + { from = 9330; to = 9339; } + { from = 30000; to = 30010; } ]; allowedUDPPorts = [ 9003 ]; extraCommands = '' + ## IGMP / Broadcast ## iptables -A INPUT -s 224.0.0.0/4 -j ACCEPT iptables -A INPUT -d 224.0.0.0/4 -j ACCEPT iptables -A INPUT -s 240.0.0.0/5 -j ACCEPT diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index effa0c06ad6..81ec0d7c47e 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -506,24 +506,24 @@ in function gitea_setup { cp -f ${configFile} ${runConfig} - if [ ! -e ${secretKey} ]; then + if [ ! -s ${secretKey} ]; then ${gitea}/bin/gitea generate secret SECRET_KEY > ${secretKey} fi # Migrate LFS_JWT_SECRET filename - if [[ -e ${oldLfsJwtSecret} && ! -e ${lfsJwtSecret} ]]; then + if [[ -s ${oldLfsJwtSecret} && ! -s ${lfsJwtSecret} ]]; then mv ${oldLfsJwtSecret} ${lfsJwtSecret} fi - if [ ! -e ${oauth2JwtSecret} ]; then + if [ ! -s ${oauth2JwtSecret} ]; then ${gitea}/bin/gitea generate secret JWT_SECRET > ${oauth2JwtSecret} fi - if [ ! -e ${lfsJwtSecret} ]; then + if [ ! -s ${lfsJwtSecret} ]; then ${gitea}/bin/gitea generate secret LFS_JWT_SECRET > ${lfsJwtSecret} fi - if [ ! -e ${internalToken} ]; then + if [ ! -s ${internalToken} ]; then ${gitea}/bin/gitea generate secret INTERNAL_TOKEN > ${internalToken} fi diff --git a/nixos/tests/kea.nix b/nixos/tests/kea.nix index 6b345893108..b1d5894cc7c 100644 --- a/nixos/tests/kea.nix +++ b/nixos/tests/kea.nix @@ -1,6 +1,8 @@ import ./make-test-python.nix ({ pkgs, lib, ...}: { meta.maintainers = with lib.maintainers; [ hexa ]; + name = "kea"; + nodes = { router = { config, pkgs, ... }: { virtualisation.vlans = [ 1 ]; |