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

updating options

This commit is contained in:
Tassilo - 2022-09-03 00:25:10 +02:00
parent 26041f3d92
commit d104792061
Signed by: revol-xut
GPG Key ID: 4F56FF7759627D07
8 changed files with 32 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
flake.lock
View File

@ -45,11 +45,11 @@
]
},
"locked": {
"lastModified": 1662120186,
"narHash": "sha256-XVpYWb3dOLiP2gwsfwG2FuhoWE9FUjEsb7JTnYWY1rY=",
"lastModified": 1662153994,
"narHash": "sha256-XLqF1GlP+PzyI4xcMpuyreiJ2SFIb+9qkvKAAbFRxNM=",
"owner": "dump-dvb",
"repo": "clicky-bunty-server",
"rev": "a7c3f24e43d4c9705765f93546a01c34f6633dc0",
"rev": "a47671933ff893d50bbf479850c2dee43c24b119",
"type": "github"
},
"original": {
@ -78,11 +78,11 @@
]
},
"locked": {
"lastModified": 1662062871,
"narHash": "sha256-Xb7XU8JyZntNH7leoH1HUE3/nL2zfZMNCiVbE8UipiQ=",
"lastModified": 1662156488,
"narHash": "sha256-kujRjv9NqaCk1bBpTUsX3CEaVJFqil+7SPqGXQ27NMg=",
"owner": "dump-dvb",
"repo": "data-accumulator",
"rev": "c6c1f4749ab1708c3317fbf516636aa49a6453c2",
"rev": "6a32aa66b556b36ec765fad07fa0f3b01c8e487d",
"type": "github"
},
"original": {
@ -111,11 +111,11 @@
]
},
"locked": {
"lastModified": 1662042037,
"narHash": "sha256-HXVfklCStSY6aBKuYIlBI6VBmgWco8HDW2W+S78ckZg=",
"lastModified": 1662154682,
"narHash": "sha256-hdWJDAdwe+bjVVUPxWzoXxitK6et9RKz6A//VqoM/Pg=",
"owner": "dump-dvb",
"repo": "decode-server",
"rev": "f72058be8478b3e4e2ac1bb1c43a0a365bef8b36",
"rev": "69457bc9cdcdd2fbd27746d89a971c3740d394cf",
"type": "github"
},
"original": {
@ -166,11 +166,11 @@
"windshield": "windshield"
},
"locked": {
"lastModified": 1662130714,
"narHash": "sha256-ndNkOLQoH417TMMMvuMl5X45Wa+gUs73T79HBf8pKm0=",
"lastModified": 1662156952,
"narHash": "sha256-FTaW9cntSlM40WuY2mc9RNgV63VdSmJA8dvwvsiZjmM=",
"owner": "dump-dvb",
"repo": "dump-dvb.nix",
"rev": "496050cf1c57b2ba3a28763c67e7fc22f2d3e2c5",
"rev": "3617139f10a90c16ca09b7d02ca3346356ce2741",
"type": "github"
},
"original": {
@ -211,11 +211,11 @@
]
},
"locked": {
"lastModified": 1661029053,
"narHash": "sha256-pEeJuK3ei7oWRM5oQEHUy6zpWM28HbNza8Bw/3UwU8w=",
"lastModified": 1662155808,
"narHash": "sha256-tAk1uNpX66HEyAjDsrHlozWWSt4a+y+k/4iZPqjfavM=",
"owner": "dump-dvb",
"repo": "dvb-api",
"rev": "2eb6f5c64fe172fee2df596bb9fbcf8a862fa63a",
"rev": "3d000a20dbf347aa3264ae33c892e68c152a03ab",
"type": "github"
},
"original": {
@ -317,11 +317,11 @@
]
},
"locked": {
"lastModified": 1659610603,
"narHash": "sha256-LYgASYSPYo7O71WfeUOaEUzYfzuXm8c8eavJcel+pfI=",
"lastModified": 1662136632,
"narHash": "sha256-RwW/aA3ueQPsilQLi7NOfUnn8MgM6WMV+oRpW+nkDMI=",
"owner": "nix-community",
"repo": "naersk",
"rev": "c6a45e4277fa58abd524681466d3450f896dc094",
"rev": "8d2f4d00cb24cda8e5bdd802b827a0eaeff34eec",
"type": "github"
},
"original": {
@ -510,11 +510,11 @@
]
},
"locked": {
"lastModified": 1661252203,
"narHash": "sha256-R0e5kvFSVoSaLT5Etr8MaCggZouOl/kiA0Zui46bcmI=",
"lastModified": 1662140439,
"narHash": "sha256-kaZ4FPCgzHUFN/FzNB81B5I7XxewyV0dkDm5wkveSPc=",
"owner": "dump-dvb",
"repo": "wartrammer-40k",
"rev": "d13cf869c6875635fa21bd00d7d5431961915ed8",
"rev": "c742caadb19c729d35e9f9a45e9d39462559714d",
"type": "github"
},
"original": {

2
modules/data-hoarder/clicky-bunty.nix
View File

@ -5,7 +5,7 @@
port = 8070;
postgresHost = "127.0.0.1";
postgresPort = config.services.postgresql.port;
postgresPasswordFile = config.sops.secrets.postgres_password_dvbdump.path;
postgresPasswordFile = config.sops.secrets.postgres_password.path;
saltFile = config.sops.secrets.postgres_password_hash_salt.path;
user = "clicky-bunty-server";
group = config.users.groups.postgres-dvbdump.name;

6
modules/data-hoarder/data-accumulator.nix
View File

@ -4,12 +4,10 @@
enable = true;
host = "0.0.0.0";
port = 8080;
DB = {
backend = "POSTGRES";
database = {
host = "127.0.0.1";
port = config.services.postgresql.port;
telegramsPasswordFile = config.sops.secrets.postgres_password_telegrams.path;
dvbPasswordFile = config.sops.secrets.postgres_password_dvbdump.path;
passwordFile = config.sops.secrets.postgres_password.path;
};
GRPC = [
{

7
modules/data-hoarder/postgres.nix
View File

@ -8,12 +8,7 @@
CREATE DATABASE dvbdump;
CREATE USER dvbdump;
GRANT ALL PRIVILEGES ON DATABASE dvbdump TO dvbdump;
ALTER ROLE dvbdump WITH PASSWORD '$(cat ${config.sops.secrets.postgres_password_dvbdump.path})';
CREATE DATABASE telegrams;
CREATE USER telegrams;
GRANT ALL PRIVILEGES ON DATABASE telegrams TO telegrams;
ALTER ROLE telegrams WITH PASSWORD '$(cat ${config.sops.secrets.postgres_password_telegrams.path})';
ALTER ROLE dvbdump WITH PASSWORD '$(cat ${config.sops.secrets.postgres_password.path})';
CREATE USER grafana;
GRANT CONNECT ON DATABASE telegrams TO grafana;

6
modules/data-hoarder/secrets.nix
View File

@ -23,11 +23,7 @@ in
postgres_password_hash_salt = {
owner = clicky-bunty-user;
};
postgres_password_dvbdump = {
group = config.users.groups.postgres-dvbdump.name;
mode = "0440";
};
postgres_password_telegrams = {
postgres_password = {
group = config.users.groups.postgres-dvbdump.name;
mode = "0440";
};

8
modules/mobile-box/dresden.nix
View File

@ -15,14 +15,6 @@
server = [ "http://127.0.0.1:8080" ];
offline = true;
};
dataAccumulator = {
enable = true;
host = "0.0.0.0";
port = 8080;
DB.backend = "CSVFILE";
R09CsvFile = "/var/lib/data-accumulator/formatted.csv";
offline = true;
};
};
networking.firewall.allowedTCPPorts = [ 80 config.dump-dvb.wartrammer.port ];
dump-dvb.wartrammer.enable = true;

7
secrets/data-hoarder-staging/secrets.yaml
View File

@ -1,6 +1,5 @@
wg-seckey: ENC[AES256_GCM,data:9KI+ZN51wiXgykD1DBMY7iZP/mNLV2nyOoIget1xMAQk98EM06EfBWIYJnA=,iv:JlDx+EGVzCMLjJbVTL8wJw7+Zgc0Nlee+3G/sqxZBlY=,tag:3nC2m/IRbxJTFbXRUSsSOQ==,type:str]
postgres_password_dvbdump: ENC[AES256_GCM,data:ZtJf3tAYolPg,iv:QNY2eFNOOQInW8OdaIdowec0T/N9IJORY5kpzU6MpCc=,tag:Q8kJS5RjFsaTzmg9Nj1wuA==,type:str]
postgres_password_telegrams: ENC[AES256_GCM,data:aMYRe5FU0aQw,iv:38emu7odFBQeaZox0sXjBlpThCIrnkEaQ8gbS8bvCuk=,tag:ASePcgnKNqvhBFp7vesHAg==,type:str]
postgres_password: ENC[AES256_GCM,data:VyIFv3EP9xia,iv:HpWwr8gm/Z60BVbh7e8OAZIqVz1DG5BwSDw+f1ZG2XY=,tag:FF4SmqkrAZix9g+n3604Og==,type:str]
postgres_password_grafana: ENC[AES256_GCM,data:A+Y0y7sNvrZP,iv:DMordUO6RU9Ym+uiGe2/KiA0rN47zIWs6WrijhWMuB8=,tag:+1vDD5KvojGYf/BTaDiW7A==,type:str]
postgres_password_hash_salt: ENC[AES256_GCM,data:N2Nl1eKmlFfFPJE=,iv:QDeMNauoCfC7egIkGUb/Ecp6vfZ/UxqjtTL6V3sadHM=,tag:SewaZDry00jUOBc12UI38g==,type:str]
sops:
@ -27,8 +26,8 @@ sops:
d0hySTdzYzcrd2o4ZmxYeGRUempaZlEKyQ29Yuk2g365pQmGGgCmbxoP7W2nvcwn
Z5Mo85xd4K/+r87KBaAPHpd6GLgyLWw1RajJ9ISI3NUWeVdBFj6k+A==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2022-07-18T18:10:17Z"
mac: ENC[AES256_GCM,data:HDNKdVoSUSNWQBfMWOnV2H83wvMNd1vsloM9yI5kDHeWOqiBVsToA5W+qwJXqWcwB4ivlvZtLqZ42Yc2gz0qfbkRfTPnT27jOAtY/6JIrSxqO7eG22Rtlm8HpAzEKTet1wqvmmtDvTIyb+3nJMkWpxjb/gkLZAW53XhNwvcVWDA=,iv:A3p0N4F75eQFWOj1NKEIQpr2PUg4kbhX17OuZnQM+T8=,tag:mTdL6bXJkdL8hvU56W8+YA==,type:str]
lastmodified: "2022-09-02T22:20:38Z"
mac: ENC[AES256_GCM,data:uFFQN/mDmQmyKxeKygmvFS8AQNKS5XFqguugcE3e1EBYblkvqL9NTqDLIBX1Y7lBLvxCq7L65FA/JUNTkDPyWSlYjLsakDj50wH9djOXYQj6RQCJq1CJ/xfzh5iGgGsbm+t1I3F7vRH9sTZc/yz9EM0m9a1widX9Y/c+NnKjpUU=,iv:IEAzqxyvK0zHA9P33GHh/2qIho2hrq0juCKskyZwHN0=,tag:XaJEOuH3oTLLDtzKDB8BKg==,type:str]
pgp:
- created_at: "2022-07-13T11:06:24Z"
enc: |-

7
secrets/data-hoarder/secrets.yaml
View File

@ -1,6 +1,5 @@
wg-seckey: ENC[AES256_GCM,data:AX2wr/+USyZ7YzAOjzuGyJlgF9UhmZH2MvsXh4EWdFdi7a5ovrsaYuq+JYI=,iv:c3/J3k6TQ6+cpqk+/wutjwbVCyzY1X/rHSJU4iw0lJA=,tag:rwVvO8LuMhXVyYXd+Udg8w==,type:str]
postgres_password_dvbdump: ENC[AES256_GCM,data:Qi1INkPxAgsORPoY06PHZ2Ky7yzJSDlEf5Dyrax57cI=,iv:7ukkqTjIyxNTN1Y3yWYNvMyO1gbmkqHLfIC3qBUHwmQ=,tag:vYElUUDAMhfTeY+Ji6d1FQ==,type:str]
postgres_password_telegrams: ENC[AES256_GCM,data:M6kTHyF+NfFqqtmOBetxcw/zqPq28hq32OkYAQd/skQ=,iv:M1ECHZbNcr2e5X6iU4Bkr6D6nzLjGMFv92EXAcsuLrc=,tag:/5Z+3eAaIqJ7TcISwcQg7g==,type:str]
postgres_password: ENC[AES256_GCM,data:jZCcoHFzOdmNscBir6cLUXav8G8LsZ/KPEPrzLKYo/s=,iv:ZVOosvb+sL7iRRpJ2vYT1UDW46ofJMcryjANg7cXBS0=,tag:ajWkqnyQwSLGwBJhf44p+Q==,type:str]
postgres_password_grafana: ENC[AES256_GCM,data:9SsU0RY1kiy0nCxED77hv8kanSh367yPeEq0IJPmvNJVJ0eRdwamxRag6rk=,iv:DjFV8DH37f1BrV53Ly1WEcaUbBRoZnwdFQLjwF7aVGA=,tag:Jej0O1t83FGflouSkRZWbQ==,type:str]
postgres_password_hash_salt: ENC[AES256_GCM,data:gMtDVjUwqOd75zOJMTaezhlBpUo=,iv:3vlrIZUm+KaGXybchUDWtXQ6cfU8Vc/DCxLXhe+igOU=,tag:LnBxOhl9rLsxV6hvaWphbA==,type:str]
sops:
@ -27,8 +26,8 @@ sops:
Y1NZQTlGSEdyaXZyenpxVHhYdzRBTHMKcH9ZSXQzEERzBmYYE4p6pbi8SudLX6jQ
ZPMo14oiOmEpu1Keek23BUeolnKBKEfsgn888yKaDsa0QKtBeUFd2Q==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2022-07-18T18:09:51Z"
mac: ENC[AES256_GCM,data:nTJlpxbWdTtUGyv1xVO4c0VLYEXTlJPLRa+hZq7dvnXkcZaBFLLO1n3fmf9SD8xpO+EMi3XqNPmIwI/8DI8xYI/sfLBtOFzwA2pYYf9bkI0tL2LKgyK47WXnDGwmMsxpoKQMtj2n0PR+I3upJpOs4SVNAmIrXBw/NyhV8IwgXoE=,iv:cpe2uvtLCDClaqD8MAz34JS+616ISfQ5I31o3u6jMEw=,tag:fKIud4ugdbsU+VSQ3cyH1A==,type:str]
lastmodified: "2022-09-02T22:20:14Z"
mac: ENC[AES256_GCM,data:eBKpGyGS0gknOH4BV6+ubeOi6eIkLLou9weUzl+UjCs4ih/SUTXp+8fsI5HJp0ng+BhYrqBVbAb5tNJB12yTFeNC1pVTK/GA3BRE6BVC/gk/428nqKKheA0/NovK3vtTop84dKPLkW+a7whXRvBA+FXktdsJcBdtIFQRZH1sL6Y=,iv:gbwfFrx6wct20/7QffZXAdKl06zVkAZvzXJm6iRL0h0=,tag:Z5tJnughjCvxpPfOHVUCTw==,type:str]
pgp:
- created_at: "2022-07-13T11:06:12Z"
enc: |-