From 8db1c182ef445f5a9bec7517d5c47b1b26e9d1e5 Mon Sep 17 00:00:00 2001 From: magic_rb Date: Sat, 7 Oct 2023 15:45:26 +0200 Subject: [PATCH] Update blowhole Signed-off-by: magic_rb --- flake.lock | 4 ++-- nixos/modules/influx-provisioning.nix | 2 +- nixos/systems/blowhole/monitoring.nix | 2 +- patches/0001-Add-Nix-integration.patch | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index e8bbfbe..b54de9b 100644 --- a/flake.lock +++ b/flake.lock @@ -1898,8 +1898,8 @@ "secret": { "flake": false, "locked": { - "lastModified": 1696257468, - "narHash": "sha256-5Vhl71S6vYnVr130B9Q6r1wy6424dxtqbGxSGLw0rnE=", + "lastModified": 1696686074, + "narHash": "sha256-EwLDx8ESxIRtJO6SWsZpuEIsCLNM2qyY4AZBEieSfHQ=", "path": "/home/main/dotfiles/secret", "type": "path" }, diff --git a/nixos/modules/influx-provisioning.nix b/nixos/modules/influx-provisioning.nix index a589889..28d575d 100644 --- a/nixos/modules/influx-provisioning.nix +++ b/nixos/modules/influx-provisioning.nix @@ -60,7 +60,7 @@ let in { options = { - services.influxdb2.provision = { + services.influxdb2.provision-magic = { enable = mkEnableOption "Enable InfluxDB2 provisioning"; itpPackage = mkOption { diff --git a/nixos/systems/blowhole/monitoring.nix b/nixos/systems/blowhole/monitoring.nix index b2ddde0..c9d8578 100644 --- a/nixos/systems/blowhole/monitoring.nix +++ b/nixos/systems/blowhole/monitoring.nix @@ -571,7 +571,7 @@ in services.influxdb2 = { enable = true; - provision = { + provision-magic = { stateFile = "/var/lib/influxdb2/itp.state"; organization = "redalder"; diff --git a/patches/0001-Add-Nix-integration.patch b/patches/0001-Add-Nix-integration.patch index 01922c9..debd0d5 100644 --- a/patches/0001-Add-Nix-integration.patch +++ b/patches/0001-Add-Nix-integration.patch @@ -99,8 +99,8 @@ index 0aa993845..812952fad 100644 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 - return nil, nil, fmt.Errorf("Failed to connect to docker daemon: %s", err) +@@ -329,6 +334,79 @@ func (d *Driver) StartTask(cfg *drivers.TaskConfig) (*drivers.TaskHandle, *drive + return nil, nil, fmt.Errorf("Failed to create long operations docker client: %v", err) } + 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) + } + - id, err := d.createImage(cfg, &driverConfig, client) + id, err := d.createImage(cfg, &driverConfig, dockerClient) if err != nil { return nil, nil, err @@ -1263,7 +1305,7 @@ func (d *Driver) toDockerMount(m *DockerMount, task *drivers.TaskConfig) (*docke