magic_rb/dotfiles
1
0
Fork 0
mirror of https://git.sr.ht/~magic_rb/dotfiles synced 2024-11-25 09:36:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update blowhole

Browse source 
Signed-off-by: magic_rb <richard@brezak.sk>
This commit is contained in:
magic_rb 2023-10-07 15:45:26 +02:00
parent b8f01a4d15
commit 8db1c182ef
No known key found for this signature in database
GPG key ID: 08D5287CC5DDCA0E
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
flake.lock
View file

@ -1898,8 +1898,8 @@
"secret": { "secret": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696257468, "lastModified": 1696686074,
"narHash": "sha256-5Vhl71S6vYnVr130B9Q6r1wy6424dxtqbGxSGLw0rnE=", "narHash": "sha256-EwLDx8ESxIRtJO6SWsZpuEIsCLNM2qyY4AZBEieSfHQ=",
"path": "/home/main/dotfiles/secret", "path": "/home/main/dotfiles/secret",
"type": "path" "type": "path"
}, },

2
nixos/modules/influx-provisioning.nix
View file

@ -60,7 +60,7 @@ let
in in
{ {
options = { options = {
services.influxdb2.provision = { services.influxdb2.provision-magic = {
enable = mkEnableOption "Enable InfluxDB2 provisioning"; enable = mkEnableOption "Enable InfluxDB2 provisioning";
itpPackage = mkOption { itpPackage = mkOption {

2
nixos/systems/blowhole/monitoring.nix
View file

@ -571,7 +571,7 @@ in
services.influxdb2 = { services.influxdb2 = {
enable = true; enable = true;
provision = { provision-magic = {
stateFile = "/var/lib/influxdb2/itp.state"; stateFile = "/var/lib/influxdb2/itp.state";
organization = "redalder"; organization = "redalder";

6
patches/0001-Add-Nix-integration.patch
View file

@ -99,8 +99,8 @@ index 0aa993845..812952fad 100644
return nil, nil, fmt.Errorf("image name required for docker driver") return nil, nil, fmt.Errorf("image name required for docker driver")
} }
@@ -269,6 +270,79 @@ func (d *Driver) StartTask(cfg *drivers.TaskConfig) (*drivers.TaskHandle, *drive @@ -329,6 +334,79 @@ func (d *Driver) StartTask(cfg *drivers.TaskConfig) (*drivers.TaskHandle, *drive
return nil, nil, fmt.Errorf("Failed to connect to docker daemon: %s", err) return nil, nil, fmt.Errorf("Failed to create long operations docker client: %v", err)
} }
+ if driverConfig.NixFlakeRef != "" && driverConfig.NixFlakeSha != "" { + if driverConfig.NixFlakeRef != "" && driverConfig.NixFlakeSha != "" {
@ -176,7 +176,7 @@ index 0aa993845..812952fad 100644
+ d.logger.Warn("one of either nix_flake_ref or nix_flake_sha is not set", "container_id", cfg.ID, "nix_flake_ref", driverConfig.NixFlakeRef, "nix_flake_sha", driverConfig.NixFlakeSha) + d.logger.Warn("one of either nix_flake_ref or nix_flake_sha is not set", "container_id", cfg.ID, "nix_flake_ref", driverConfig.NixFlakeRef, "nix_flake_sha", driverConfig.NixFlakeSha)
+ } + }
+ +
id, err := d.createImage(cfg, &driverConfig, client) id, err := d.createImage(cfg, &driverConfig, dockerClient)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
@@ -1263,7 +1305,7 @@ func (d *Driver) toDockerMount(m *DockerMount, task *drivers.TaskConfig) (*docke @@ -1263,7 +1305,7 @@ func (d *Driver) toDockerMount(m *DockerMount, task *drivers.TaskConfig) (*docke