From 37465492a9cdf373cffbdfeff58c99b30955f8f3 Mon Sep 17 00:00:00 2001 From: Marco Streich Date: Thu, 21 Jan 2021 17:17:43 +0100 Subject: [PATCH] Streamline path, prevent file from being written before volume is mounted --- infrastructure/modules/compute/cloudinit.tpl | 2 +- infrastructure/modules/compute/nix/elasticsearch.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/infrastructure/modules/compute/cloudinit.tpl b/infrastructure/modules/compute/cloudinit.tpl index f273bd0..0e6354b 100644 --- a/infrastructure/modules/compute/cloudinit.tpl +++ b/infrastructure/modules/compute/cloudinit.tpl @@ -87,7 +87,7 @@ write_files: } owner: root:root permissions: '0644' - - path: /mnt/data/kibana-elasticsearch-password + - path: /opt/cloud-init-misc-data/kibana_elasticsearch_password content: ${kibana_elasticsearch_password} owner: root:root permissions: '0600' diff --git a/infrastructure/modules/compute/nix/elasticsearch.nix b/infrastructure/modules/compute/nix/elasticsearch.nix index 2fc00de..6bf3d81 100644 --- a/infrastructure/modules/compute/nix/elasticsearch.nix +++ b/infrastructure/modules/compute/nix/elasticsearch.nix @@ -28,7 +28,7 @@ sleep 5 done printf "Setting up Kibana user\n" - curl -uelastic:changeme -XPUT -H 'Content-Type: application/json' 'http://10.0.1.51:9200/_xpack/security/user/kibana/_password' -d "{ \"password\":\"$(head -n 1 /mnt/data/kibana-elasticsearch-password)\"}" + curl -uelastic:changeme -XPUT -H 'Content-Type: application/json' 'http://10.0.1.51:9200/_xpack/security/user/kibana/_password' -d "{ \"password\":\"$(head -n 1 /opt/cloud-init-misc-data/kibana_elasticsearch_password)\"}" ''; services.kibana.enable = true; @@ -37,7 +37,7 @@ services.kibana.listenAddress = "0.0.0.0"; services.kibana.elasticsearch.hosts = [ "http://10.0.1.51:9200" ]; services.kibana.elasticsearch.username = "kibana"; - services.kibana.elasticsearch.password = (builtins.readFile /mnt/data/kibana-elasticsearch-password); + services.kibana.elasticsearch.password = (builtins.readFile /opt/cloud-init-misc-data/kibana_elasticsearch_password); system.activationScripts = { mnt = {