mirror of
https://github.com/dump-dvb/nix-config.git
synced 2024-06-03 06:49:24 +02:00
redirect to https
This commit is contained in:
parent
16cea9dd3c
commit
9a37a249ab
129
flake.lock
129
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": {
|
||||
|
|
17
flake.nix
17
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:
|
||||
{
|
||||
|
@ -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";
|
||||
}
|
||||
];
|
||||
|
|
|
@ -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 = {
|
||||
|
|
20
modules/documentation.nix
Normal file
20
modules/documentation.nix
Normal file
|
@ -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";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
|
@ -1,4 +1,4 @@
|
|||
{pkgs, lib, ...} : {
|
||||
{ pkgs, lib, ... }: {
|
||||
services = {
|
||||
nginx = {
|
||||
enable = true;
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
virtualHosts = {
|
||||
"map.dvb.solutions" = {
|
||||
enableACME = true;
|
||||
onlySSL = true;
|
||||
locations = {
|
||||
"/" = {
|
||||
root = "${pkgs.windshield}/bin/";
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{pkgs, config, lib, ...}:
|
||||
{ pkgs, config, lib, ... }:
|
||||
let
|
||||
file = ../configs/mobile_box.json;
|
||||
in
|
||||
|
|
|
@ -28,6 +28,7 @@
|
|||
virtualHosts = {
|
||||
"socket.dvb.solutions" = {
|
||||
enableACME = true;
|
||||
onlySSL = true;
|
||||
locations = {
|
||||
"/" = {
|
||||
proxyPass = "http://127.0.0.1:9001/";
|
||||
|
@ -37,6 +38,7 @@
|
|||
};
|
||||
"api.dvb.solutions" = {
|
||||
enableACME = true;
|
||||
onlySSL = true;
|
||||
locations = {
|
||||
"/" = {
|
||||
proxyPass = "http://127.0.0.1:9002/";
|
||||
|
|
Loading…
Reference in New Issue
Block a user