From 95b83eca3c6b0b44991c028d699734fcc5069ed6 Mon Sep 17 00:00:00 2001 From: Grigory Shipunov Date: Fri, 23 Sep 2022 17:26:27 +0200 Subject: [PATCH 1/4] move mobile box common modules into it's own list --- flake.nix | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/flake.nix b/flake.nix index 408cdc2..3c1f384 100644 --- a/flake.nix +++ b/flake.nix @@ -48,13 +48,7 @@ } ]; - # function that generates a system with the given number - generate_system = (id: arch: extraModules: - { - "traffic-stop-box-${toString id}" = nixpkgs.lib.nixosSystem { - system = arch; - specialArgs = inputs; - modules = [ + stop-box-modules = [ sops-nix.nixosModules.sops dump-dvb.nixosModules.default ./hosts/traffic-stop-box @@ -64,9 +58,20 @@ nixpkgs.overlays = [ dump-dvb.overlays.default ]; + } + ]; + + # function that generates a system with the given number + generate_system = (id: arch: extraModules: + { + "traffic-stop-box-${toString id}" = nixpkgs.lib.nixosSystem { + system = arch; + specialArgs = inputs; + modules = [ + { dump-dvb.systemNumber = id; } - ] ++ extraModules; + ] ++ extraModules ++ stop-box-modules; }; } ); @@ -100,6 +105,7 @@ ]; } { + # unused id = 3; arch = "aarch64-linux"; extraModules = [ From 87baca9742b042a998d4d3fc0d108ac353a7e7d0 Mon Sep 17 00:00:00 2001 From: Grigory Shipunov Date: Mon, 26 Sep 2022 01:36:05 +0200 Subject: [PATCH 2/4] make flake evaluate again --- flake.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/flake.nix b/flake.nix index 3c1f384..a5cb84c 100644 --- a/flake.nix +++ b/flake.nix @@ -143,13 +143,7 @@ arch = "x86_64-linux"; extraModules = [ ./hardware/dell-wyse-3040.nix - ]; - } - { - id = 7; - arch = "x86_64-linux"; - extraModules = [ - ./hardware/dell-wyse-3040.nix + dump-dvb.nixosModules.disk-module ]; } ]; @@ -168,7 +162,6 @@ mobile-box-muenster-disk = self.nixosConfigurations.mobile-box-muenster.config.system.build.diskImage; staging-microvm = self.nixosConfigurations.staging-data-hoarder.config.microvm.declaredRunner; data-hoarder-microvm = self.nixosConfigurations.data-hoarder.config.microvm.declaredRunner; - traffic-stop-box-6-disk."x86_64-linux" = self.nixosConfigurations.traffic-stop-box-6.config.system.build.sdImage; docs = pkgs.callPackage ./pkgs/documentation.nix { options-docs = (pkgs.nixosOptionsDoc { options = self.nixosConfigurations.data-hoarder.options.dump-dvb; @@ -195,8 +188,8 @@ mobile-box-dresden = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = inputs; - modules = mobile-box-modules ++ [ - ./modules/mobile-box/dresden.nix + modules = mobile-box-modules ++ [ + ./modules/mobile-box/dresden.nix { dump-dvb.telegramDecoder.configFile = "${self}/configs/mobile_box_dresden.json"; } @@ -205,8 +198,8 @@ mobile-box-muenster = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = inputs; - modules = mobile-box-modules ++ [ - ./modules/mobile-box/muenster.nix + modules = mobile-box-modules ++ [ + ./modules/mobile-box/muenster.nix { dump-dvb.telegramDecoder.configFile = "${self}/configs/mobile_box_muenster.json"; } From 30817f795405dd63903010137480902c697839e6 Mon Sep 17 00:00:00 2001 From: Grigory Shipunov Date: Mon, 26 Sep 2022 01:46:45 +0200 Subject: [PATCH 3/4] remove broken CORS headers --- modules/data-hoarder/nginx.nix | 6 +----- modules/data-hoarder/website.nix | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/modules/data-hoarder/nginx.nix b/modules/data-hoarder/nginx.nix index 1ae9250..8a26a20 100644 --- a/modules/data-hoarder/nginx.nix +++ b/modules/data-hoarder/nginx.nix @@ -1,6 +1,6 @@ { pkgs, config, lib, ... }: let - default-headers = '' + headers = '' # Permissions Policy - gps only add_header Permissions-Policy "geolocation=()"; @@ -20,10 +20,6 @@ let # STS add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always; ''; - data-hoarder-headers = if lib.hasSuffix "data-hoarder" config.networking.hostName then '' - add_header 'Access-Control-Allow-Origin' '*' always; - '' else ''''; - headers = default-headers + data-hoarder-headers; in { security.acme.acceptTerms = true; diff --git a/modules/data-hoarder/website.nix b/modules/data-hoarder/website.nix index f4ebfe6..81b9956 100644 --- a/modules/data-hoarder/website.nix +++ b/modules/data-hoarder/website.nix @@ -9,7 +9,6 @@ "/" = { extraConfig = '' return 307 https://docs.dvb.solutions; - add_header Access-Control-Allow-Origin *; ''; }; }; From b93356b0b2798e446764aef26a5b2de035118dbc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sun, 25 Sep 2022 23:50:13 +0000 Subject: [PATCH 4/4] Remove dead code --- hosts/display/configuration.nix | 2 +- modules/data-hoarder/documentation.nix | 2 +- modules/data-hoarder/nginx.nix | 2 +- modules/mobile-box/chemnitz.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hosts/display/configuration.nix b/hosts/display/configuration.nix index e02529f..59359fd 100644 --- a/hosts/display/configuration.nix +++ b/hosts/display/configuration.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: +{ pkgs, ... }: { boot.tmpOnTmpfs = true; diff --git a/modules/data-hoarder/documentation.nix b/modules/data-hoarder/documentation.nix index c782daf..7d8d79c 100644 --- a/modules/data-hoarder/documentation.nix +++ b/modules/data-hoarder/documentation.nix @@ -1,4 +1,4 @@ -{ pkgs, config, lib, ... }: +{ pkgs, config, ... }: let documentation-package = pkgs.callPackage ../../pkgs/documentation.nix { }; in { diff --git a/modules/data-hoarder/nginx.nix b/modules/data-hoarder/nginx.nix index 8a26a20..c68bcee 100644 --- a/modules/data-hoarder/nginx.nix +++ b/modules/data-hoarder/nginx.nix @@ -1,4 +1,4 @@ -{ pkgs, config, lib, ... }: +{ ... }: let headers = '' # Permissions Policy - gps only diff --git a/modules/mobile-box/chemnitz.nix b/modules/mobile-box/chemnitz.nix index 2586489..a39445a 100644 --- a/modules/mobile-box/chemnitz.nix +++ b/modules/mobile-box/chemnitz.nix @@ -1,4 +1,4 @@ -{ pkgs, config, lib, ... }: +{ pkgs, config, ... }: let reciever_conf = { frequency = 153850000; offset = 25000; device = ""; RF = 14; IF = 32; BB = 42; }; # chemnitz in { dump-dvb = {