dump-dvb/nix-config
dump-dvb
/
nix-config
mirror of https://github.com/dump-dvb/nix-config.git
3
0
Fork 0
Code Issues Projects Releases Wiki Activity

add config for serving stops.json

This commit is contained in:
Tassilo - 2022-07-28 21:11:34 +02:00
parent 475af0c4b6
commit 897e716693
Signed by: revol-xut
GPG Key ID: 4F56FF7759627D07
4 changed files with 137 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

163
flake.lock
View File

@ -128,15 +128,16 @@
"nixpkgs"
],
"radio-conf": "radio-conf",
"stops": "stops_4",
"wartrammer": "wartrammer",
"windshield": "windshield"
},
"locked": {
"lastModified": 1658420804,
"narHash": "sha256-ai5Cs0e4l8Od0HhsuUJdpRCb10jyectiSsrfrihBrQE=",
"lastModified": 1659033226,
"narHash": "sha256-ZkesH6wlIjCx1Ug/tVuJbMuyjraApiq4L16hz4n2YCQ=",
"owner": "dump-dvb",
"repo": "dump-dvb.nix",
"rev": "b53ea1f3daa7fd8f68453f8837e38eec895bd592",
"rev": "588d48fe6d72063fc4e6d3deb3e4725a20baf908",
"type": "github"
},
"original": {
@ -168,6 +169,29 @@
"type": "github"
}
},
"fenix": {
"inputs": {
"nixpkgs": [
"dump-dvb",
"stops",
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1651732109,
"narHash": "sha256-W3GuTyMxswHGfaYTQ4Ajev6GxfDef8YyxyYbFgrfwNk=",
"owner": "nix-community",
"repo": "fenix",
"rev": "4b6dda7529e6d1d8d2ce43b7cb18efdefd5c4c3c",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"flake-utils": {
"locked": {
"lastModified": 1653893745,
@ -193,11 +217,11 @@
"utils": "utils_6"
},
"locked": {
"lastModified": 1658399140,
"narHash": "sha256-FWiCQMA+VXJnFKyvdHpACCQd0KwIN5yP3JpL71IIf7o=",
"lastModified": 1659024831,
"narHash": "sha256-E7OziIlHVwCD2X0GRHrPZfe3V26xWErEbXnFTF+gKdM=",
"owner": "dump-dvb",
"repo": "funnel",
"rev": "0113ef47ca9e740a6826e177bef9b06cac3f57c6",
"rev": "8c2c87f249b2da1537c0a5e6d4c0f660e0d19e69",
"type": "github"
},
"original": {
@ -318,6 +342,28 @@
}
},
"naersk_6": {
"inputs": {
"nixpkgs": [
"dump-dvb",
"stops",
"nixpkgs"
]
},
"locked": {
"lastModified": 1651574473,
"narHash": "sha256-wQhFORvRjo8LB2hTmETmv6cbyKGDPbfWqvZ/0chnDE4=",
"owner": "nix-community",
"repo": "naersk",
"rev": "f21309b38e1da0d61b881b6b6d41b81c1aed4e1d",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "naersk",
"type": "github"
}
},
"naersk_7": {
"inputs": {
"nixpkgs": "nixpkgs_6"
},
@ -351,11 +397,11 @@
},
"nixpkgs-22_05": {
"locked": {
"lastModified": 1658029355,
"narHash": "sha256-VJcYmkYfzwHrZ76SMH6y9KqoVFOPgZiJgh1rK9cF2mw=",
"lastModified": 1658634393,
"narHash": "sha256-VW7edeFzA9VU8gZPxPFGpoPsM2AQLYHKhA9H5+OYtno=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4e329926df7ee5fa49929a83d31ee7d541f8b45c",
"rev": "2e14bc76ab41c60ba57fd57ff52badaa29d349f5",
"type": "github"
},
"original": {
@ -437,11 +483,11 @@
},
"nixpkgs_7": {
"locked": {
"lastModified": 1658321858,
"narHash": "sha256-2f5NzHbi1NLSYnDg6cRu25B+XRxqngicvggg+0GgKHI=",
"lastModified": 1658912196,
"narHash": "sha256-GTP5XCLPU2Hg2bQC5dVqSBF9ef5C/J6pD4qM09Ba4Gk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "26fe7618c7efbbfe28db9a52a21fb87e67ebaf06",
"rev": "d9536b9b1e33377fb520e115bc8588d093ed97be",
"type": "github"
},
"original": {
@ -478,8 +524,24 @@
"dump-dvb": "dump-dvb",
"microvm": "microvm",
"nixpkgs": "nixpkgs_7",
"sops-nix": "sops-nix",
"stops": "stops_4"
"sops-nix": "sops-nix"
}
},
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1651656737,
"narHash": "sha256-+nc9Rrc1PBGAx2jXV57Af8WL4nQTTNGX2fp63YD7ynU=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "1f709d54463972b189a3120be4073c507f2fbc00",
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
}
},
"sops-nix": {
@ -490,11 +552,11 @@
"nixpkgs-22_05": "nixpkgs-22_05"
},
"locked": {
"lastModified": 1658398472,
"narHash": "sha256-DjPJ3YQXyV1GRvF3ToBIY+RYdypwNxYchN1HIhDPLe0=",
"lastModified": 1658635258,
"narHash": "sha256-EC8y3Rg+l9IzIUdOaFSA0LMdDipTRoweg1Y2EL8XhMc=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "6efa719f8d02139ce41398b9e59e06888dc1305a",
"rev": "d7f8cf1b77ebe5f287884f17b1ee4cc4f48bad1d",
"type": "github"
},
"original": {
@ -552,13 +614,21 @@
}
},
"stops_4": {
"flake": false,
"inputs": {
"fenix": "fenix",
"naersk": "naersk_6",
"nixpkgs": [
"dump-dvb",
"nixpkgs"
],
"utils": "utils_8"
},
"locked": {
"lastModified": 1657633705,
"narHash": "sha256-BDV91x/0qYfDDcig8srXHLxfEUL0Mvhp966PLnSFX3w=",
"lastModified": 1659032945,
"narHash": "sha256-M9RVtRmrdt+JnEgdIk1m7XcFLpQGugHvcMr14p2cInM=",
"owner": "dump-dvb",
"repo": "stop-names",
"rev": "f9d3b2b83325e719bd899847cc8b7944a70b8765",
"rev": "ea7322c691255a7afc3fd96aef32aef3f48bc15e",
"type": "github"
},
"original": {
@ -582,6 +652,21 @@
"type": "github"
}
},
"utils_10": {
"locked": {
"lastModified": 1649676176,
"narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_2": {
"locked": {
"lastModified": 1652776076,
@ -673,21 +758,6 @@
}
},
"utils_8": {
"locked": {
"lastModified": 1652776076,
"narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_9": {
"locked": {
"lastModified": 1649676176,
"narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
@ -702,14 +772,29 @@
"type": "github"
}
},
"utils_9": {
"locked": {
"lastModified": 1652776076,
"narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"wartrammer": {
"inputs": {
"naersk": "naersk_6",
"naersk": "naersk_7",
"nixpkgs": [
"dump-dvb",
"nixpkgs"
],
"utils": "utils_8"
"utils": "utils_9"
},
"locked": {
"lastModified": 1657129381,
@ -731,7 +816,7 @@
"dump-dvb",
"nixpkgs"
],
"utils": "utils_9"
"utils": "utils_10"
},
"locked": {
"lastModified": 1657126666,

14
flake.nix
View File

@ -16,11 +16,6 @@
url = github:Mic92/sops-nix;
inputs.nixpkgs.follows = "nixpkgs";
};
stops = {
url = github:dump-dvb/stop-names;
flake = false;
};
};
outputs =
@ -29,7 +24,6 @@
, microvm
, nixpkgs
, sops-nix
, stops
, ...
}:
let
@ -46,8 +40,8 @@
nixpkgs.overlays = [
dump-dvb.overlays.default
];
dump-dvb.stopsJson = "${stops}/stops.json";
dump-dvb.graphJson = "${stops}/graph.json";
dump-dvb.stopsJson = "${pkgs.stops}/json/stops.json";
dump-dvb.graphJson = "${pkgs.stops}/json/graph.json";
}
];
@ -91,7 +85,7 @@
dump-dvb.overlays.default
];
dump-dvb.systemNumber = number;
dump-dvb.stopsJson = "${stops}/stops.json";
dump-dvb.stopsJson = "${pkgs.stops}/json/stops.json";
}
];
};
@ -132,7 +126,7 @@
./modules/dump-dvb
sops-nix.nixosModules.sops
{
dump-dvb.stopsJson = "${stops}/stops.json";
dump-dvb.stopsJson = "${pkgs.stops}/json/stops.json";
dump-dvb.systemNumber = 130;
dump-dvb.telegramDecoder.configFile = "${self}/configs/mobile_box.json";
}

3
modules/data-hoarder/map.nix
View File

@ -12,6 +12,9 @@
root = if (config.dump-dvb.domain == "dvb.solutions") then "${pkgs.windshield}/bin/" else "${pkgs.windshield-staging}/bin/";
index = "index.html";
};
"/stops/" = {
root = "${pkgs.stops}/json/";
};
};
};
};

10
modules/data-hoarder/website.nix
View File

@ -5,10 +5,12 @@
"${config.dump-dvb.domain}" = {
enableACME = true;
forceSSL = true;
locations."/" = {
extraConfig = ''
return 307 https://docs.dvb.solutions;
'';
locations = {
"/" = {
extraConfig = ''
return 307 https://docs.dvb.solutions;
'';
};
};
};
};