From 9a37a249ab022c69b33ace25d754ef9813c7c760 Mon Sep 17 00:00:00 2001 From: revol-xut Date: Mon, 9 May 2022 16:50:23 +0200 Subject: [PATCH] redirect to https --- flake.lock | 129 +++++++------------- flake.nix | 61 +++++---- hosts/mobile-box/hardware-configuration.nix | 10 +- modules/data-accumulator.nix | 18 --- modules/documentation.nix | 20 +++ modules/file_sharing.nix | 18 +-- modules/map.nix | 1 + modules/mobile-box.nix | 2 +- modules/public_api.nix | 8 +- 9 files changed, 124 insertions(+), 143 deletions(-) create mode 100644 modules/documentation.nix diff --git a/flake.lock b/flake.lock index 19a2a87..c6c7448 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1651771534, - "narHash": "sha256-ckol+a4FC+TLdZkrit+GDIDbfFqDq/5ikcu/aORSvrE=", + "lastModified": 1651921038, + "narHash": "sha256-nPIeidYP3AL2Ify2o7j2H5vc639OC1TPdzS0tljMqoY=", "owner": "dump-dvb", "repo": "data-accumulator", - "rev": "b24e87e009b9d5c77020563fe411e244c407a49d", + "rev": "4f2fa68c3718eaaa86c78cdc00b13480be236004", "type": "github" }, "original": { @@ -45,10 +45,34 @@ "type": "github" } }, + "docs": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1652107302, + "narHash": "sha256-iq45VgrTL97HQvuQ5mW9NoG3XMCWLKBSpT8yXxxskpU=", + "owner": "dump-dvb", + "repo": "documentation", + "rev": "fd8fa3d6633623bf0f2f89e239b06d4cd9fcdb90", + "type": "github" + }, + "original": { + "owner": "dump-dvb", + "repo": "documentation", + "type": "github" + } + }, "dvb-api": { "inputs": { - "naersk": "naersk_2", - "nixpkgs": "nixpkgs_4", + "naersk": [ + "naersk" + ], + "nixpkgs": [ + "nixpkgs" + ], "utils": "utils_3" }, "locked": { @@ -84,24 +108,6 @@ } }, "naersk_2": { - "inputs": { - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1650265945, - "narHash": "sha256-SO8+1db4jTOjnwP++29vVgImLIfETSXyoz0FuLkiikE=", - "owner": "nix-community", - "repo": "naersk", - "rev": "e8f9f8d037774becd82fce2781e1abdb7836d7df", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "naersk", - "type": "github" - } - }, - "naersk_3": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -123,11 +129,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1651927509, - "narHash": "sha256-fGVGUdEsriuAL1vkUh29FlOQmEkPRnSfRGImWYaVjos=", + "lastModified": 1652059086, + "narHash": "sha256-CjHSbr6LSFkN4YBdTB6+8ZQmSqhsbiXqAeQ9hQJ/gBI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fdb6f2e08e7989b03a2a1aa8538d99e3eeea881", + "rev": "934e076a441e318897aa17540f6cf7caadc69028", "type": "github" }, "original": { @@ -153,41 +159,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1651927509, - "narHash": "sha256-fGVGUdEsriuAL1vkUh29FlOQmEkPRnSfRGImWYaVjos=", + "lastModified": 1652020977, + "narHash": "sha256-9hDlNbrxzD/pLlXmoQ6gzxbYiSAKrj7uHYUWNByLFlI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fdb6f2e08e7989b03a2a1aa8538d99e3eeea881", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1651007983, - "narHash": "sha256-GNay7yDPtLcRcKCNHldug85AhAvBpTtPEJWSSDYBw8U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e10da1c7f542515b609f8dfbcf788f3d85b14936", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1651848520, - "narHash": "sha256-KkJ28fShdd78+zal5HlHsXUICOCtO7Bdvylc5zlp5Mk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5656d7f92aa8264eb06ba68ad94c87ac5b5312e8", + "rev": "3c5ae9be1f18c790ea890ef8decbd0946c0b4c04", "type": "github" }, "original": { @@ -197,7 +173,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_4": { "locked": { "lastModified": 1651571855, "narHash": "sha256-KZie6c2J2DUPLjG2PkYSwGLvD6RygA3TxZSPQpctbNI=", @@ -213,25 +189,9 @@ "type": "github" } }, - "nixpkgs_7": { - "locked": { - "lastModified": 1651007983, - "narHash": "sha256-GNay7yDPtLcRcKCNHldug85AhAvBpTtPEJWSSDYBw8U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e10da1c7f542515b609f8dfbcf788f3d85b14936", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "radio-conf": { "inputs": { - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_4", "utils": "utils_4" }, "locked": { @@ -252,9 +212,10 @@ "inputs": { "data-accumulator": "data-accumulator", "decode-server": "decode-server", + "docs": "docs", "dvb-api": "dvb-api", - "naersk": "naersk_3", - "nixpkgs": "nixpkgs_5", + "naersk": "naersk_2", + "nixpkgs": "nixpkgs_3", "radio-conf": "radio-conf", "stops": "stops_2", "windshield": "windshield" @@ -279,11 +240,11 @@ "stops_2": { "flake": false, "locked": { - "lastModified": 1651796301, - "narHash": "sha256-Asx2Zy+teLTRqenGP3aZpJ/hLAUP+T75d6sqBZgTmP8=", + "lastModified": 1651967879, + "narHash": "sha256-RZ2TskwwjCcqX4svFbTEtNZTXGAbD6xROk1n18sw+Gg=", "owner": "dump-dvb", "repo": "stop-names", - "rev": "3fa704f6815b91030e294b24809966cbc17a6f5e", + "rev": "faf526f02b69cf0ddf988816b1d035aca509e9d8", "type": "github" }, "original": { @@ -369,7 +330,9 @@ }, "windshield": { "inputs": { - "nixpkgs": "nixpkgs_7", + "nixpkgs": [ + "nixpkgs" + ], "utils": "utils_5" }, "locked": { diff --git a/flake.nix b/flake.nix index cae5a15..1246161 100644 --- a/flake.nix +++ b/flake.nix @@ -23,6 +23,8 @@ dvb-api = { url = github:dump-dvb/dvb-api; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.naersk.follows = "naersk"; }; stops = { @@ -32,10 +34,16 @@ windshield = { url = github:dump-dvb/windshield; + inputs.nixpkgs.follows = "nixpkgs"; + }; + + docs = { + url = github:dump-dvb/documentation; + inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { self, nixpkgs, naersk, radio-conf, data-accumulator, decode-server, dvb-api, stops, windshield, ... }@inputs: + outputs = { self, nixpkgs, naersk, radio-conf, data-accumulator, decode-server, dvb-api, stops, windshield, docs, ... }@inputs: let generate_system = (number: { @@ -77,28 +85,28 @@ packages."x86_64-linux".mobile-box-iso = self.nixosConfigurations.mobile-box.config.system.build.isoImage; nixosConfigurations = stop_boxes // { - "mobile-box" = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { inherit inputs; }; - modules = [ - "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-base.nix" - ./hosts/mobile-box/configuration.nix - ./hosts/mobile-box/hardware-configuration.nix - ./hardware/configuration-dell-wyse-3040.nix - ./modules/numbering.nix - ./modules/mobile-box.nix - { - nixpkgs.overlays = [ - radio-conf.overlay."x86_64-linux" - decode-server.overlay."x86_64-linux" - data-accumulator.overlay."x86_64-linux" - ]; - dvb-dump.stopsJson = "${stops}/stops.json"; - dvb-dump.systemNumber = 130; - } - ]; - }; - } // + "mobile-box" = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = { inherit inputs; }; + modules = [ + "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-base.nix" + ./hosts/mobile-box/configuration.nix + ./hosts/mobile-box/hardware-configuration.nix + ./hardware/configuration-dell-wyse-3040.nix + ./modules/numbering.nix + ./modules/mobile-box.nix + { + nixpkgs.overlays = [ + radio-conf.overlay."x86_64-linux" + decode-server.overlay."x86_64-linux" + data-accumulator.overlay."x86_64-linux" + ]; + dvb-dump.stopsJson = "${stops}/stops.json"; + dvb-dump.systemNumber = 130; + } + ]; + }; + } // { data-hoarder = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -113,7 +121,12 @@ ./modules/file_sharing.nix ./modules/numbering.nix { - nixpkgs.overlays = [ data-accumulator.overlay."x86_64-linux" dvb-api.overlay."x86_64-linux" windshield.overlay."x86_64-linux" ]; + nixpkgs.overlays = [ + data-accumulator.overlay."x86_64-linux" + dvb-api.overlay."x86_64-linux" + windshield.overlay."x86_64-linux" + docs.overlay."x86_64-linux" + ]; dvb-dump.stopsJson = "${stops}/stops.json"; } ]; diff --git a/hosts/mobile-box/hardware-configuration.nix b/hosts/mobile-box/hardware-configuration.nix index d6300c0..41c535f 100644 --- a/hosts/mobile-box/hardware-configuration.nix +++ b/hosts/mobile-box/hardware-configuration.nix @@ -26,11 +26,11 @@ fsType = "vfat"; }; - swapDevices = [ - { - device = "/dev/mmcblk0p1"; - } - ]; + swapDevices = [ + { + device = "/dev/mmcblk0p1"; + } + ]; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/modules/data-accumulator.nix b/modules/data-accumulator.nix index d4de0de..c9a3729 100644 --- a/modules/data-accumulator.nix +++ b/modules/data-accumulator.nix @@ -26,24 +26,6 @@ }; }; - services = { - nginx = { - enable = true; - recommendedProxySettings = true; - virtualHosts = { - "academicstrokes.com" = { - enableACME = true; - locations = { - "/" = { - proxyPass = "http://127.0.0.1:8080/"; - proxyWebsockets = true; - }; - }; - }; - }; - }; - }; - # user accounts for systemd units users.users = { data-accumulator = { diff --git a/modules/documentation.nix b/modules/documentation.nix new file mode 100644 index 0000000..f09ddbf --- /dev/null +++ b/modules/documentation.nix @@ -0,0 +1,20 @@ +{ pkgs, lib, ... }: { + services = { + nginx = { + enable = true; + recommendedProxySettings = true; + virtualHosts = { + "docs.dvb.solutions" = { + enableACME = true; + onlySSL = true; + locations = { + "/" = { + root = "${pkgs.dvb-dump-docs}/bin/"; + index = "index.html"; + }; + }; + }; + }; + }; + }; +} diff --git a/modules/file_sharing.nix b/modules/file_sharing.nix index b5448b9..84b8fe3 100644 --- a/modules/file_sharing.nix +++ b/modules/file_sharing.nix @@ -1,4 +1,4 @@ -{pkgs, lib, ...} : { +{ pkgs, lib, ... }: { services = { nginx = { enable = true; @@ -11,15 +11,15 @@ extraConfig = '' autoindex on; ''; - }; }; }; - cron = { - enable = true; - systemCronJobs = [ - "0 0 0 * * cd /var/lib/data-accumulator/ && cp ./formatted.csv ./data/$(date +\"%d-%m-%Y\")-raw-data.csv" - ]; - - }; }; + cron = { + enable = true; + systemCronJobs = [ + "0 0 0 * * cd /var/lib/data-accumulator/ && cp ./formatted.csv ./data/$(date +\"%d-%m-%Y\")-raw-data.csv" + ]; + + }; + }; } diff --git a/modules/map.nix b/modules/map.nix index c8291f0..8287baf 100644 --- a/modules/map.nix +++ b/modules/map.nix @@ -6,6 +6,7 @@ virtualHosts = { "map.dvb.solutions" = { enableACME = true; + onlySSL = true; locations = { "/" = { root = "${pkgs.windshield}/bin/"; diff --git a/modules/mobile-box.nix b/modules/mobile-box.nix index 52a1467..60e6b24 100644 --- a/modules/mobile-box.nix +++ b/modules/mobile-box.nix @@ -1,4 +1,4 @@ -{pkgs, config, lib, ...}: +{ pkgs, config, lib, ... }: let file = ../configs/mobile_box.json; in diff --git a/modules/public_api.nix b/modules/public_api.nix index 4e2ee8b..526f1c7 100644 --- a/modules/public_api.nix +++ b/modules/public_api.nix @@ -5,7 +5,7 @@ enable = true; wantedBy = [ "multi-user.target" ]; - script = "exec ${pkgs.dvb-api}/bin/dvb-api &"; + script = "exec ${pkgs.dvb-api}/bin/dvb-api &"; environment = { "GRPC_HOST" = "127.0.0.1:50051"; @@ -20,7 +20,7 @@ }; }; }; - + services = { nginx = { enable = true; @@ -28,6 +28,7 @@ virtualHosts = { "socket.dvb.solutions" = { enableACME = true; + onlySSL = true; locations = { "/" = { proxyPass = "http://127.0.0.1:9001/"; @@ -35,8 +36,9 @@ }; }; }; - "api.dvb.solutions" = { + "api.dvb.solutions" = { enableACME = true; + onlySSL = true; locations = { "/" = { proxyPass = "http://127.0.0.1:9002/";