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 basic map site

This commit is contained in:
Tassilo - 2022-05-02 12:38:16 +02:00
parent faac4da0a0
commit 3f1b82ab43
Signed by: revol-xut
GPG Key ID: 4F56FF7759627D07
5 changed files with 536 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

405
configs/stops.json Normal file
View File

@ -0,0 +1,405 @@
{
"102": {
"name": "LSA Anton-/Leipziger Straße",
"lat": 51.063033,
"lon": 13.736958
},
"103": {
"name": "Anton-/Zur Eisenbahnstraße",
"lat": 51.064067,
"lon": 13.736935
},
"104": {
"name": "Schlesischer Platz",
"lat": 51.064783,
"lon": 13.740362
},
"107": {
"name": "Albertplatz",
"lat": 51.063252,
"lon": 13.746367
},
"108": {
"name": "Albertplatz West",
"lat": 51.064241,
"lon": 13.744951
},
"109": {
"name": "Bautzner/Rothenburger",
"lat": 51.062925,
"lon": 13.751871
},
"119": {
"name": "Straßburger Platz",
"lat": 51.046078,
"lon": 13.754815
},
"120": {
"name": "Lennéstraße/Hauptallee",
"lat": 51.042455,
"lon": 13.751296
},
"121": {
"name": "Lennéplatz",
"lat": 51.038294,
"lon": 13.746646
},
"136": {
"name": "Könneritzstraße/Jahnstraße",
"lat": 51.055101,
"lon": 13.723554
},
"200": {
"name": "Synagoge",
"lat": 51.052611,
"lon": 13.747128
},
"201": {
"name": "St. Petersburger Straße/Pulmann-Newa",
"lat": 51.042306,
"lon": 13.736348
},
"203": {
"name": "Pirnaischer Platz",
"lat": 51.049434,
"lon": 13.744379
},
"204": {
"name": "Rathenauplatz",
"lat": 51.051463,
"lon": 13.747008
},
"205": {
"name": "Carolaplatz",
"lat": 51.057410,
"lon": 13.745794
},
"206": {
"name": "Neustädter Markt",
"lat": 51.057757,
"lon": 13.741322
},
"207": {
"name": "Robert-Blum-Straße / Große Meißner Str.",
"lat": 51.061568,
"lon": 13.737761
},
"208": {
"name": "Bodenbacher / Zwinglistraße",
"lat": 51.033500,
"lon": 13.782810
},
"268": {
"name": "Albertplatz Süd",
"lat": 51.061454,
"lon": 13.746032
},
"305": {
"name": "Karcherallee",
"lat": 51.0370345,
"lon": 13.7781818
},
"307": {
"name": "Stübelallee/Zwinglistraße",
"lat": 51.0346967,
"lon": 13.7840746
},
"308": {
"name": "Zwinglistraße",
"lat": 51.0340625,
"lon": 13.7833343
},
"310": {
"name": "Rennplatzstraße",
"lat": 51.0272979,
"lon": 13.8004320
},
"311": {
"name": "Marienberger Straße",
"lat": 51.0256244,
"lon": 13.8052278
},
"324": {
"name": "Fetscherplatz",
"lat": 51.046367,
"lon": 13.770653
},
"330": {
"name": "Schandauer Straße/Alternberger Straße",
"lat": 51.0394224,
"lon": 13.8059762
},
"346": {
"name": "Schillerplatz",
"lat": 51.052175,
"lon": 13.805205
},
"357": {
"name": "Hepkestraße",
"lat": 51.0327378,
"lon": 13.8052781
},
"363": {
"name": "Blasewitzer/Fetscherstraße",
"lat": 51.052881,
"lon": 13.777738
},
"387": {
"name": "Seidnitz Center",
"lat": 51.0297010,
"lon": 13.8024819
},
"405": {
"name": "Caspar-David-Friedrich-Straße",
"lat": 51.0264364,
"lon": 13.7556769
},
"406": {
"name": "Heinrich-Zille-Straße",
"lat": 51.0255861,
"lon": 13.7572326
},
"421": {
"name": "Wasaplatz",
"lat": 51.027979,
"lon": 13.759444
},
"429": {
"name": "Moränenende/Breitscheidstraße",
"lat": 51.0135254,
"lon": 13.8110393
},
"435": {
"name": "Moränenende/Wilhelm-Liebknecht-Straße",
"lat": 51.0125937,
"lon": 13.8100717
},
"452": {
"name": "Tiergartenstraße",
"lat": 51.0298346,
"lon": 13.7711960
},
"453": {
"name": "Karchallee/Winterbergstraße",
"lat": 51.0331947,
"lon": 13.7745916
},
"454": {
"name": "Dresden Grunaer Weg",
"lat": 51.0309016,
"lon": 13.7803976
},
"455": {
"name": "Winderbergstraße",
"lat": 51.0241871,
"lon": 13.7973314
},
"459": {
"name": "Mügelner Straße/Moränenende",
"lat": 51.0112617,
"lon": 13.8079246
},
"504": {
"name": "Reichenbachstraße",
"lat": 51.0348507,
"lon": 13.7312898
},
"506": {
"name": "Fritz-Foerster-Platz",
"lat": 51.0301741,
"lon": 13.7307460
},
"552": {
"name": "Zellescher Weg",
"lat": 51.0284316,
"lon": 13.7459510
},
"604": {
"name": "Nürnberger/Budapester Str.",
"lat": 51.0369342,
"lon": 13.7157618
},
"606": {
"name": "Chemnitzer/Nöthritzer Str.",
"lat": 51.0292989,
"lon": 13.7071278
},
"651": {
"name": "Nürnberger Platz",
"lat": 51.0323243,
"lon": 13.7261459
},
"804": {
"name": "Tharandter/Kesselsdorfer Straße",
"lat": 51.0436693,
"lon": 13.7043013
},
"851": {
"name": "Löbtauer Straße/Fröbelstraße",
"lat": 51.0500279,
"lon": 13.7126293
},
"1101": {
"name": "Louisenstraße",
"lat": 51.0680048,
"lon": 13.7477077
},
"1102": {
"name": "Bischofsweg",
"lat": 51.0713760,
"lon": 13.7506816
},
"1103": {
"name": "Tannenstraße",
"lat": 51.0737276,
"lon": 13.7528442
},
"1151": {
"name": "Bischofsplatz",
"lat": 51.071993,
"lon": 13.746973
},
"1104": {
"name": "Staufenbergallee",
"lat": 51.0766329,
"lon": 13.7555318
},
"1202": {
"name": "LSA Bautzner Straße/Pulsnitzer",
"lat": 51.0633708,
"lon": 13.7578833
},
"1203": {
"name": "Pulsnitzer Straße",
"lat": 51.063314,
"lon": 13.757515
},
"1205": {
"name": "Diakonissenkrankenhaus",
"lat": 51.0641348,
"lon": 13.7621847
},
"1220": {
"name": "Nordstraße",
"lat": 51.0661350,
"lon": 13.7694067
},
"1301": {
"name": "Körnerplatz/Grundstr.",
"lat": 51.0539600,
"lon": 13.8150960
},
"1501": {
"name": "Hansastraße/Eisenbahnstraße",
"lat": 51.0657888,
"lon": 13.7381732
},
"3402": {
"name": "Dresden Johannisfriedhof",
"lat": 51.0368414,
"lon": 13.8125265
},
"408": {
"name": "Corinthstraße",
"lat": 51.0213106,
"lon": 13.7643742
},
"403": {
"name": "Stehlener Platz",
"lat": 51.0331333,
"lon": 13.7488785
},
"402": {
"name": "Gerhart-Hauptmann-Straße/Tiergartenstraße",
"lat": 51.0374158,
"lon": 13.7487953
},
"401": {
"name": "Lenneplatz",
"lat": 51.0380162,
"lon": 13.7474113
},
"121": {
"name": "Leneestraße/Gellerstraße",
"lat": 51.0383636,
"lon": 13.7466174
},
"123": {
"name": "Gret-Palucca-Straße",
"lat": 51.0389626,
"lon": 13.7394281
},
"501": {
"name": "Fritz-Löffler-Straße/Stehlener Straße",
"lat": 51.0389726,
"lon": 13.7332578
},
"192": {
"name": "Hauptbahnhof",
"lat": 51.0396540,
"lon": 13.7337835
},
"302": {
"name": "Comeniusplatz",
"lat": 51.0416777,
"lon": 13.7666030
},
"1504": {
"name": "Dresden Grossenhainer Platz",
"lat": 51.074117,
"lon": 13.738611
},
"1404": {
"name": "Dresden Grossenhainer Strasse / Frintz-Reuter-Strasse",
"lat": 51.075230,
"lon": 13.734514
},
"1270": {
"name": "Stauffenbergalle / Hans-Oster-Strasse",
"lat": 51.075896,
"lon": 13.757962
},
"1293": {
"name":"Hans-Oster-Strasse",
"lat": 51.074884,
"lon": 13.760771
},
"1257": {
"name":"Marienallee",
"lat": 51.073226,
"lon": 13.765502
},
"1271": {
"name":"Landesdirektion Sachsen",
"lat": 51.071685,
"lon": 13.770473
},
"1258": {
"name":"Waldschloesschenstrasse",
"lat": 51.069858,
"lon": 13.775674
},
"1206": {
"name":"Waldschloesschen",
"lat": 51.067329,
"lon": 13.776489
},
"1276": {
"name": "Jaegerpark Heideblick",
"lat": 51.070416,
"lon": 13.788827
},
"1301": {
"name": "Koernerplatz",
"lat": 51.054347,
"lon": 13.814161
},
"112": {
"name": "Rosa-Luxemburg-Platz",
"lat": 51.059115,
"lon": 13.752996
}
}

99
flake.lock
View File

@ -8,14 +8,15 @@
"nixpkgs": [
"nixpkgs"
],
"stops": "stops",
"utils": "utils"
},
"locked": {
"lastModified": 1651425666,
"narHash": "sha256-UTW7a6rsA5iSVSpQZoM6ASEMHsGrJ+rX6s3CaY5IWZE=",
"lastModified": 1651437931,
"narHash": "sha256-cNNnCRZQbohXxE3aHV0RfV3+ludIHKTMvZR2x4tcbT8=",
"owner": "dump-dvb",
"repo": "data-accumulator",
"rev": "71c704c756669b9708cad30c48503c4b9233e0f8",
"rev": "fc3a8b5e46752ffed6f136aea0c815f123b67142",
"type": "github"
},
"original": {
@ -51,11 +52,11 @@
"utils": "utils_3"
},
"locked": {
"lastModified": 1651425439,
"narHash": "sha256-+EgWY87ZJ60R9pas9QqyGw0T0rdZt6eVxN/q8AfGpu8=",
"lastModified": 1651438175,
"narHash": "sha256-UHVIBc7An03+RGtdosw+loa4wL4CMmuqoReB5V9qTao=",
"owner": "dump-dvb",
"repo": "dvb-api",
"rev": "16cc71327ca9c115d3d06df8a3ec8a21d4e9b561",
"rev": "50fe521866f8a014784b4f8db4a3d24d9ed5c355",
"type": "github"
},
"original": {
@ -190,6 +191,22 @@
"type": "github"
}
},
"nixpkgs_5": {
"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_4",
@ -216,7 +233,41 @@
"dvb-api": "dvb-api",
"naersk": "naersk_3",
"nixpkgs": "nixpkgs_3",
"radio-conf": "radio-conf"
"radio-conf": "radio-conf",
"stops": "stops_2",
"windshield": "windshield"
}
},
"stops": {
"flake": false,
"locked": {
"lastModified": 1651422271,
"narHash": "sha256-Z4vOWBPVA6QFYjoJ0VgUmIpRMuoFpA+hDL5gfe7kq/8=",
"owner": "dump-dvb",
"repo": "stop-names",
"rev": "dee2d0cdcf4e86f143dd4c20ae5a4a26382746f7",
"type": "github"
},
"original": {
"owner": "dump-dvb",
"repo": "stop-names",
"type": "github"
}
},
"stops_2": {
"flake": false,
"locked": {
"lastModified": 1651448037,
"narHash": "sha256-D+SWKLgc0jXGtAVdN929nLSTnrMzpJ+4did5SKVFG88=",
"owner": "dump-dvb",
"repo": "stop-names",
"rev": "a2d8a8ba60b51ba91b2274118f0af036a4f9a2bc",
"type": "github"
},
"original": {
"owner": "dump-dvb",
"repo": "stop-names",
"type": "github"
}
},
"utils": {
@ -278,6 +329,40 @@
"repo": "flake-utils",
"type": "github"
}
},
"utils_5": {
"locked": {
"lastModified": 1649676176,
"narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"windshield": {
"inputs": {
"nixpkgs": "nixpkgs_5",
"utils": "utils_5"
},
"locked": {
"lastModified": 1651488278,
"narHash": "sha256-yyf/mPm4Q25mDsRWPPKH7p9IxX7pApUjrqnwepCl+gU=",
"owner": "dump-dvb",
"repo": "windshield",
"rev": "55a4f45b40a5f09017019f77d8e08079dbae7c24",
"type": "github"
},
"original": {
"owner": "dump-dvb",
"repo": "windshield",
"type": "github"
}
}
},
"root": "root",

18
flake.nix
View File

@ -24,9 +24,18 @@
dvb-api = {
url = github:dump-dvb/dvb-api;
};
stops = {
url = github:dump-dvb/stop-names;
flake = false;
};
windshield = {
url = github:dump-dvb/windshield;
};
};
outputs = { self, nixpkgs, naersk, radio-conf, data-accumulator, decode-server, dvb-api, ... }@inputs:
outputs = { self, nixpkgs, naersk, radio-conf, data-accumulator, decode-server, dvb-api, stops, windshield, ... }@inputs:
let
generate_system = (number:
{
@ -43,6 +52,7 @@
{
nixpkgs.overlays = [ radio-conf.overlay."x86_64-linux" decode-server.overlay."x86_64-linux" ];
dvb-dump.systemNumber = number;
dvb-dump.stopsJson = "${stops}/stops.json";
}
];
};
@ -80,6 +90,7 @@
{
nixpkgs.overlays = [ radio-conf.overlay."aarch64-linux" decode-server.overlay."aarch64-linux" ];
dvb-dump.systemNumber = 99;
dvb-dump.stopsJson = "${stops}/stops.json";
}
];
};
@ -94,8 +105,11 @@
./modules/nginx.nix
./modules/wireguard_server.nix
./modules/public_api.nix
./modules/map.nix
./modules/numbering.nix
{
nixpkgs.overlays = [ data-accumulator.overlay."x86_64-linux" dvb-api.overlay."x86_64-linux" ];
nixpkgs.overlays = [ data-accumulator.overlay."x86_64-linux" dvb-api.overlay."x86_64-linux" windshield.overlay."x86_64-linux" ];
dvb-dump.stopsJson = "${stops}/stops.json";
}
];
};

18
modules/map.nix Normal file
View File

@ -0,0 +1,18 @@
{ pkgs, config, lib, ... }: {
services = {
nginx = {
enable = true;
recommendedProxySettings = true;
virtualHosts = {
"map.dvb.solutions" = {
enableACME = true;
locations = {
"/" = {
index = "${pkgs.windshield}/bin/index.html";
};
};
};
};
};
};
}

5
modules/numbering.nix
View File

@ -5,6 +5,11 @@ with lib; {
default = 0;
description = "number of the system";
};
options.dvb-dump.stopsJson = mkOption {
type = types.path;
default = ../configs/stops.json;
description = "stops conig json";
};
}