diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-13 12:01:25 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-13 12:01:25 +0000 |
| commit | cecf050e96fa1495e6dcf7b2c7395e0e3359ff05 (patch) | |
| tree | 751ae53b00eb92d24a775ef9e7277200b7c0cbb5 /nixos/modules | |
| parent | 68befa13bb19eff9aa59d124b6d5801b99e26bc2 (diff) | |
| parent | a6af0d92679222ba704841a6515d9a7e022af6fd (diff) | |
| download | nixlib-cecf050e96fa1495e6dcf7b2c7395e0e3359ff05.tar nixlib-cecf050e96fa1495e6dcf7b2c7395e0e3359ff05.tar.gz nixlib-cecf050e96fa1495e6dcf7b2c7395e0e3359ff05.tar.bz2 nixlib-cecf050e96fa1495e6dcf7b2c7395e0e3359ff05.tar.lz nixlib-cecf050e96fa1495e6dcf7b2c7395e0e3359ff05.tar.xz nixlib-cecf050e96fa1495e6dcf7b2c7395e0e3359ff05.tar.zst nixlib-cecf050e96fa1495e6dcf7b2c7395e0e3359ff05.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/modules')
4 files changed, 4 insertions, 11 deletions
diff --git a/nixos/modules/services/monitoring/scrutiny.nix b/nixos/modules/services/monitoring/scrutiny.nix index aef924ef840c..2862cdd80128 100644 --- a/nixos/modules/services/monitoring/scrutiny.nix +++ b/nixos/modules/services/monitoring/scrutiny.nix @@ -201,17 +201,12 @@ in Type = "oneshot"; ExecStart = "${getExe cfg.collector.package} run --config ${settingsFormat.generate "scrutiny-collector.yaml" cfg.collector.settings}"; }; + startAt = cfg.collector.schedule; }; }; timers = mkIf cfg.collector.enable { - scrutiny-collector = { - timerConfig = { - OnCalendar = cfg.collector.schedule; - Persistent = true; - Unit = "scrutiny-collector.service"; - }; - }; + scrutiny-collector.timerConfig.Persistent = true; }; }; }; diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index cc5741fe8853..0a4fcde72111 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -307,7 +307,7 @@ in }; dns = mkOption { - type = types.enum [ "default" "dnsmasq" "unbound" "systemd-resolved" "none" ]; + type = types.enum [ "default" "dnsmasq" "systemd-resolved" "none" ]; default = "default"; description = lib.mdDoc '' Set the DNS (`resolv.conf`) processing mode. diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix index 17c6789827b9..242fcd500bb0 100644 --- a/nixos/modules/services/networking/unbound.nix +++ b/nixos/modules/services/networking/unbound.nix @@ -230,8 +230,6 @@ in { resolvconf = { useLocalResolver = mkDefault true; }; - - networkmanager.dns = "unbound"; }; environment.etc."unbound/unbound.conf".source = confFile; diff --git a/nixos/modules/services/web-apps/gotosocial.nix b/nixos/modules/services/web-apps/gotosocial.nix index 45464f646da8..657509c11005 100644 --- a/nixos/modules/services/web-apps/gotosocial.nix +++ b/nixos/modules/services/web-apps/gotosocial.nix @@ -27,7 +27,7 @@ let in { meta.doc = ./gotosocial.md; - meta.maintainers = with lib.maintainers; [ misuzu ]; + meta.maintainers = with lib.maintainers; [ misuzu blakesmith ]; options.services.gotosocial = { enable = lib.mkEnableOption (lib.mdDoc "ActivityPub social network server"); |