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

update flake lock

This commit is contained in:
Tassilo - 2023-03-20 03:58:25 +01:00
parent dea23084d0 3bca2e756f
commit acd5dab81d
Signed by: revol-xut
GPG Key ID: 4F56FF7759627D07
4 changed files with 67 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

219
flake.lock
View File

@ -57,14 +57,16 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"utils": "utils_2" "utils": [
"flake-utils"
]
}, },
"locked": { "locked": {
"lastModified": 1679280255, "lastModified": 1679280767,
"narHash": "sha256-Z0LfAI9AfdhnPoT1TEFu5F11XgJ6UNwQIZILgYnrxfU=", "narHash": "sha256-h+mOKksNjbnvryPB28nWOeaGyFBAHqJ2Tu9BLeHMZgU=",
"owner": "tlm-solutions", "owner": "tlm-solutions",
"repo": "data-accumulator", "repo": "data-accumulator",
"rev": "ae17cdbc7590f82a224301899be34c57ccee8811", "rev": "fd14ca0586133027f695eba6ce3bc1be6667f701",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -84,7 +86,9 @@
"tlms-rs": [ "tlms-rs": [
"tlms-rs" "tlms-rs"
], ],
"utils": "utils_3" "utils": [
"flake-utils"
]
}, },
"locked": { "locked": {
"lastModified": 1678477361, "lastModified": 1678477361,
@ -156,11 +160,11 @@
}, },
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1676283394, "lastModified": 1678901627,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073", "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -176,7 +180,9 @@
"nixpkgs" "nixpkgs"
], ],
"tlms-rust": "tlms-rust", "tlms-rust": "tlms-rust",
"utils": "utils_4" "utils": [
"flake-utils"
]
}, },
"locked": { "locked": {
"lastModified": 1678020126, "lastModified": 1678020126,
@ -197,7 +203,9 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"utils": "utils_5" "utils": [
"flake-utils"
]
}, },
"locked": { "locked": {
"lastModified": 1678306615, "lastModified": 1678306615,
@ -234,7 +242,9 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"utils": "utils_6" "utils": [
"flake-utils"
]
}, },
"locked": { "locked": {
"lastModified": 1678484240, "lastModified": 1678484240,
@ -253,7 +263,9 @@
"microvm": { "microvm": {
"inputs": { "inputs": {
"fenix": "fenix", "fenix": "fenix",
"flake-utils": "flake-utils", "flake-utils": [
"flake-utils"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@ -346,6 +358,7 @@
"data-accumulator": "data-accumulator", "data-accumulator": "data-accumulator",
"datacare": "datacare", "datacare": "datacare",
"documentation-src": "documentation-src", "documentation-src": "documentation-src",
"flake-utils": "flake-utils",
"funnel": "funnel", "funnel": "funnel",
"gnuradio-decoder": "gnuradio-decoder", "gnuradio-decoder": "gnuradio-decoder",
"kindergarten": "kindergarten", "kindergarten": "kindergarten",
@ -434,7 +447,9 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"utils": "utils_7" "utils": [
"flake-utils"
]
}, },
"locked": { "locked": {
"lastModified": 1678547620, "lastModified": 1678547620,
@ -458,14 +473,16 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"utils": "utils_8" "utils": [
"flake-utils"
]
}, },
"locked": { "locked": {
"lastModified": 1679279026, "lastModified": 1679280726,
"narHash": "sha256-ep22GpG1Bs+bJkk/T2odFlDMSYtsojn1hmfMBnCIlB0=", "narHash": "sha256-Q4AtmR9IeMRM9uLBIoet99MCm6YDCqE4SDZzx55WobU=",
"owner": "tlm-solutions", "owner": "tlm-solutions",
"repo": "telegram-decoder", "repo": "telegram-decoder",
"rev": "3a441f90c1dc02ffe3b1cc892e37d272f83efef6", "rev": "2631bfffdc5a40f539e2a640961f115b760e5a85",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -481,11 +498,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1679278853, "lastModified": 1679280626,
"narHash": "sha256-wGWZ1Cs0VRREms6/Yfdd70ECm7gsRWw6EQOet0MbWyg=", "narHash": "sha256-Im9VhJm99E6C2oI3u3ZG66EF/xTsoauv/JmbQu+Vk58=",
"owner": "tlm-solutions", "owner": "tlm-solutions",
"repo": "tlms.rs", "repo": "tlms.rs",
"rev": "4b78be3caa74591928f93bc1219a18a0413a51cf", "rev": "f9d6b514fb4165acd8c779bb0708f078cf3ecf94",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -521,7 +538,9 @@
"tlms-rs": [ "tlms-rs": [
"tlms-rs" "tlms-rs"
], ],
"utils": "utils_9" "utils": [
"flake-utils"
]
}, },
"locked": { "locked": {
"lastModified": 1678485606, "lastModified": 1678485606,
@ -552,156 +571,6 @@
"type": "github" "type": "github"
} }
}, },
"utils_10": {
"locked": {
"lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_11": {
"locked": {
"lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_2": {
"locked": {
"lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_3": {
"locked": {
"lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_4": {
"locked": {
"lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_5": {
"locked": {
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_6": {
"locked": {
"lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_7": {
"locked": {
"lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_8": {
"locked": {
"lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"utils_9": {
"locked": {
"lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"wartrammer": { "wartrammer": {
"inputs": { "inputs": {
"naersk": [ "naersk": [
@ -711,7 +580,9 @@
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"utils": "utils_10" "utils": [
"flake-utils"
]
}, },
"locked": { "locked": {
"lastModified": 1677985694, "lastModified": 1677985694,
@ -732,7 +603,9 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"utils": "utils_11" "utils": [
"flake-utils"
]
}, },
"locked": { "locked": {
"lastModified": 1678530041, "lastModified": 1678530041,

14
flake.nix
View File

@ -9,9 +9,13 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# DO NOT remame this to utils
flake-utils.url = github:numtide/flake-utils;
microvm = { microvm = {
url = "github:astro/microvm.nix"; url = "github:astro/microvm.nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
}; };
sops-nix = { sops-nix = {
@ -31,6 +35,7 @@
nixpkgs.follows = "nixpkgs"; nixpkgs.follows = "nixpkgs";
naersk.follows = "naersk"; naersk.follows = "naersk";
tlms-rs.follows = "tlms-rs"; tlms-rs.follows = "tlms-rs";
utils.follows = "flake-utils";
}; };
}; };
@ -40,12 +45,14 @@
nixpkgs.follows = "nixpkgs"; nixpkgs.follows = "nixpkgs";
naersk.follows = "naersk"; naersk.follows = "naersk";
tlms-rs.follows = "tlms-rs"; tlms-rs.follows = "tlms-rs";
utils.follows = "flake-utils";
}; };
}; };
kindergarten = { kindergarten = {
url = "github:tlm-solutions/kindergarten"; url = "github:tlm-solutions/kindergarten";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.utils.follows = "flake-utils";
}; };
telegram-decoder = { telegram-decoder = {
@ -53,40 +60,47 @@
inputs = { inputs = {
nixpkgs.follows = "nixpkgs"; nixpkgs.follows = "nixpkgs";
naersk.follows = "naersk"; naersk.follows = "naersk";
utils.follows = "flake-utils";
}; };
}; };
gnuradio-decoder = { gnuradio-decoder = {
url = "github:tlm-solutions/gnuradio-decoder"; url = "github:tlm-solutions/gnuradio-decoder";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.utils.follows = "flake-utils";
}; };
data-accumulator = { data-accumulator = {
url = "github:tlm-solutions/data-accumulator"; url = "github:tlm-solutions/data-accumulator";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.naersk.follows = "naersk"; inputs.naersk.follows = "naersk";
inputs.utils.follows = "flake-utils";
}; };
state-api = { state-api = {
url = "github:tlm-solutions/state-api"; url = "github:tlm-solutions/state-api";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.naersk.follows = "naersk"; inputs.naersk.follows = "naersk";
inputs.utils.follows = "flake-utils";
}; };
funnel = { funnel = {
url = "github:tlm-solutions/funnel"; url = "github:tlm-solutions/funnel";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.utils.follows = "flake-utils";
}; };
windshield = { windshield = {
url = "github:tlm-solutions/windshield"; url = "github:tlm-solutions/windshield";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.utils.follows = "flake-utils";
}; };
wartrammer = { wartrammer = {
url = "github:tlm-solutions/wartrammer-40k"; url = "github:tlm-solutions/wartrammer-40k";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.naersk.follows = "naersk"; inputs.naersk.follows = "naersk";
inputs.utils.follows = "flake-utils";
}; };
tlms-rs = { tlms-rs = {

4
modules/TLMS/binary-cache.nix
View File

@ -11,11 +11,11 @@
config = lib.mkIf config.TLMS.useBinaryCache { config = lib.mkIf config.TLMS.useBinaryCache {
nix.settings = { nix.settings = {
substituters = [ substituters = [
"https://dump-dvb.cachix.org" "https://tlm-solutions.cachix.org"
"https://hydra.hq.c3d2.de" "https://hydra.hq.c3d2.de"
]; ];
trusted-public-keys = [ trusted-public-keys = [
"dump-dvb.cachix.org-1:+Dq7gqpQG4YlLA2X3xJsG1v3BrlUGGpVtUKWk0dTyUU=" "tlm-solutions.cachix.org-1:J7qT6AvoNWPSj+59ed5bNESj35DLJNaROqga1EjVIoA="
"nix-serve.hq.c3d2.de:KZRGGnwOYzys6pxgM8jlur36RmkJQ/y8y62e52fj1ps=" "nix-serve.hq.c3d2.de:KZRGGnwOYzys6pxgM8jlur36RmkJQ/y8y62e52fj1ps="
]; ];
}; };

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

@ -29,10 +29,7 @@
TimeoutSec = lib.mkForce 3000; TimeoutSec = lib.mkForce 3000;
}; };
postStart = lib.mkAfter '' postStart = lib.mkAfter ''
# TODO: make shure grafana can't read tokens... # set pw for the users
$PSQL -c "GRANT CONNECT ON DATABASE tlms TO grafana;"
$PSQL -c "GRANT SELECT ON ALL TABLES IN SCHEMA public TO grafana";
$PSQL -c "ALTER ROLE tlms WITH PASSWORD '$(cat ${config.sops.secrets.postgres_password.path})';" $PSQL -c "ALTER ROLE tlms WITH PASSWORD '$(cat ${config.sops.secrets.postgres_password.path})';"
$PSQL -c "ALTER ROLE grafana WITH PASSWORD '$(cat ${config.sops.secrets.postgres_password_grafana.path})';" $PSQL -c "ALTER ROLE grafana WITH PASSWORD '$(cat ${config.sops.secrets.postgres_password_grafana.path})';"
@ -40,23 +37,16 @@
${inputs.tlms-rs.packages.x86_64-linux.run-migration-based}/bin/run-migration ${inputs.tlms-rs.packages.x86_64-linux.run-migration-based}/bin/run-migration
# fixup permissions # fixup permissions
# tlms is practically root, we need to FIXME something about it
$PSQL -c "GRANT ALL ON DATABASE tlms TO tlms;" $PSQL -c "GRANT ALL ON DATABASE tlms TO tlms;"
$PSQL -d tlms -c "GRANT ALL ON ALL TABLES IN SCHEMA public TO tlms;" $PSQL -d tlms -c "GRANT ALL ON ALL TABLES IN SCHEMA public TO tlms;"
$PSQL -d tlms -c "GRANT ALL ON ALL SEQUENCES IN SCHEMA public TO tlms;" $PSQL -d tlms -c "GRANT ALL ON ALL SEQUENCES IN SCHEMA public TO tlms;"
unset DATABASE_URL # Get graphana to SELECT from tables that might be interesting for it
$PSQL -c "GRANT CONNECT ON DATABASE tlms TO grafana;"
export DATABASE_URL=postgres:///dvbdump $PSQL -d tlms -c "GRANT SELECT ON r09_telegrams, raw_telegrams, gps_points, trekkie_runs, regions TO grafana;"
${inputs.tlms-rs.packages.x86_64-linux.run-migration}/bin/run-migration
# fixup permissions
$PSQL -c "GRANT ALL ON DATABASE dvbdump TO dvbdump;"
$PSQL -d dvbdump -c "GRANT ALL ON ALL TABLES IN SCHEMA public TO dvbdump;"
$PSQL -d dvbdump -c "GRANT ALL ON ALL SEQUENCES IN SCHEMA public TO dvbdump;"
unset DATABASE_URL unset DATABASE_URL
''; '';
}; };