diff --git a/deploy/docker-compose/tg-launch-azure-cassandra.yaml b/deploy/docker-compose/tg-launch-azure-cassandra.yaml index 547c3aa6..f7599d12 100644 --- a/deploy/docker-compose/tg-launch-azure-cassandra.yaml +++ b/deploy/docker-compose/tg-launch-azure-cassandra.yaml @@ -69,9 +69,9 @@ services: restart: on-failure:100 volumes: - grafana-storage:/var/lib/grafana - - ./grafana/provisioning/:/etc/grafana/provisioning/dashboards/ - - ./grafana/provisioning/:/etc/grafana/provisioning/datasources/ - - ./grafana/dashboards/:/var/lib/grafana/dashboards/ + - ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/dashboards/ + - ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/datasources/ + - ${CONFIGDIR}/grafana/dashboards/:/var/lib/grafana/dashboards/ graph-rag: command: - graph-rag @@ -176,7 +176,7 @@ services: - 9090:9090 restart: on-failure:100 volumes: - - ./prometheus:/etc/prometheus/ + - ${CONFIGDIR}/prometheus:/etc/prometheus/ - prometheus-data:/prometheus prompt: command: diff --git a/deploy/docker-compose/tg-launch-azure-neo4j.yaml b/deploy/docker-compose/tg-launch-azure-neo4j.yaml index 79525710..f6642ca0 100644 --- a/deploy/docker-compose/tg-launch-azure-neo4j.yaml +++ b/deploy/docker-compose/tg-launch-azure-neo4j.yaml @@ -52,9 +52,9 @@ services: restart: on-failure:100 volumes: - grafana-storage:/var/lib/grafana - - ./grafana/provisioning/:/etc/grafana/provisioning/dashboards/ - - ./grafana/provisioning/:/etc/grafana/provisioning/datasources/ - - ./grafana/dashboards/:/var/lib/grafana/dashboards/ + - ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/dashboards/ + - ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/datasources/ + - ${CONFIGDIR}/grafana/dashboards/:/var/lib/grafana/dashboards/ graph-rag: command: - graph-rag @@ -177,7 +177,7 @@ services: - 9090:9090 restart: on-failure:100 volumes: - - ./prometheus:/etc/prometheus/ + - ${CONFIGDIR}/prometheus:/etc/prometheus/ - prometheus-data:/prometheus prompt: command: diff --git a/deploy/docker-compose/tg-launch-bedrock-cassandra.yaml b/deploy/docker-compose/tg-launch-bedrock-cassandra.yaml index 8dd10511..e8bca8b3 100644 --- a/deploy/docker-compose/tg-launch-bedrock-cassandra.yaml +++ b/deploy/docker-compose/tg-launch-bedrock-cassandra.yaml @@ -69,9 +69,9 @@ services: restart: on-failure:100 volumes: - grafana-storage:/var/lib/grafana - - ./grafana/provisioning/:/etc/grafana/provisioning/dashboards/ - - ./grafana/provisioning/:/etc/grafana/provisioning/datasources/ - - ./grafana/dashboards/:/var/lib/grafana/dashboards/ + - ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/dashboards/ + - ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/datasources/ + - ${CONFIGDIR}/grafana/dashboards/:/var/lib/grafana/dashboards/ graph-rag: command: - graph-rag @@ -176,7 +176,7 @@ services: - 9090:9090 restart: on-failure:100 volumes: - - ./prometheus:/etc/prometheus/ + - ${CONFIGDIR}/prometheus:/etc/prometheus/ - prometheus-data:/prometheus prompt: command: diff --git a/deploy/docker-compose/tg-launch-bedrock-neo4j.yaml b/deploy/docker-compose/tg-launch-bedrock-neo4j.yaml index 3da7aa57..c4fc9266 100644 --- a/deploy/docker-compose/tg-launch-bedrock-neo4j.yaml +++ b/deploy/docker-compose/tg-launch-bedrock-neo4j.yaml @@ -52,9 +52,9 @@ services: restart: on-failure:100 volumes: - grafana-storage:/var/lib/grafana - - ./grafana/provisioning/:/etc/grafana/provisioning/dashboards/ - - ./grafana/provisioning/:/etc/grafana/provisioning/datasources/ - - ./grafana/dashboards/:/var/lib/grafana/dashboards/ + - ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/dashboards/ + - ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/datasources/ + - ${CONFIGDIR}/grafana/dashboards/:/var/lib/grafana/dashboards/ graph-rag: command: - graph-rag @@ -177,7 +177,7 @@ services: - 9090:9090 restart: on-failure:100 volumes: - - ./prometheus:/etc/prometheus/ + - ${CONFIGDIR}/prometheus:/etc/prometheus/ - prometheus-data:/prometheus prompt: command: diff --git a/deploy/docker-compose/tg-launch-claude-cassandra.yaml b/deploy/docker-compose/tg-launch-claude-cassandra.yaml index 97d3752f..59db820d 100644 --- a/deploy/docker-compose/tg-launch-claude-cassandra.yaml +++ b/deploy/docker-compose/tg-launch-claude-cassandra.yaml @@ -69,9 +69,9 @@ services: restart: on-failure:100 volumes: - grafana-storage:/var/lib/grafana - - ./grafana/provisioning/:/etc/grafana/provisioning/dashboards/ - - ./grafana/provisioning/:/etc/grafana/provisioning/datasources/ - - ./grafana/dashboards/:/var/lib/grafana/dashboards/ + - ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/dashboards/ + - ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/datasources/ + - ${CONFIGDIR}/grafana/dashboards/:/var/lib/grafana/dashboards/ graph-rag: command: - graph-rag @@ -176,7 +176,7 @@ services: - 9090:9090 restart: on-failure:100 volumes: - - ./prometheus:/etc/prometheus/ + - ${CONFIGDIR}/prometheus:/etc/prometheus/ - prometheus-data:/prometheus prompt: command: diff --git a/deploy/docker-compose/tg-launch-claude-neo4j.yaml b/deploy/docker-compose/tg-launch-claude-neo4j.yaml index add8b52b..2d157d12 100644 --- a/deploy/docker-compose/tg-launch-claude-neo4j.yaml +++ b/deploy/docker-compose/tg-launch-claude-neo4j.yaml @@ -52,9 +52,9 @@ services: restart: on-failure:100 volumes: - grafana-storage:/var/lib/grafana - - ./grafana/provisioning/:/etc/grafana/provisioning/dashboards/ - - ./grafana/provisioning/:/etc/grafana/provisioning/datasources/ - - ./grafana/dashboards/:/var/lib/grafana/dashboards/ + - ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/dashboards/ + - ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/datasources/ + - ${CONFIGDIR}/grafana/dashboards/:/var/lib/grafana/dashboards/ graph-rag: command: - graph-rag @@ -177,7 +177,7 @@ services: - 9090:9090 restart: on-failure:100 volumes: - - ./prometheus:/etc/prometheus/ + - ${CONFIGDIR}/prometheus:/etc/prometheus/ - prometheus-data:/prometheus prompt: command: diff --git a/deploy/docker-compose/tg-launch-cohere-cassandra.yaml b/deploy/docker-compose/tg-launch-cohere-cassandra.yaml index 957beb0f..f6497469 100644 --- a/deploy/docker-compose/tg-launch-cohere-cassandra.yaml +++ b/deploy/docker-compose/tg-launch-cohere-cassandra.yaml @@ -69,9 +69,9 @@ services: restart: on-failure:100 volumes: - grafana-storage:/var/lib/grafana - - ./grafana/provisioning/:/etc/grafana/provisioning/dashboards/ - - ./grafana/provisioning/:/etc/grafana/provisioning/datasources/ - - ./grafana/dashboards/:/var/lib/grafana/dashboards/ + - ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/dashboards/ + - ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/datasources/ + - ${CONFIGDIR}/grafana/dashboards/:/var/lib/grafana/dashboards/ graph-rag: command: - graph-rag @@ -176,7 +176,7 @@ services: - 9090:9090 restart: on-failure:100 volumes: - - ./prometheus:/etc/prometheus/ + - ${CONFIGDIR}/prometheus:/etc/prometheus/ - prometheus-data:/prometheus prompt: command: diff --git a/deploy/docker-compose/tg-launch-cohere-neo4j.yaml b/deploy/docker-compose/tg-launch-cohere-neo4j.yaml index e016e6ea..048ad2a3 100644 --- a/deploy/docker-compose/tg-launch-cohere-neo4j.yaml +++ b/deploy/docker-compose/tg-launch-cohere-neo4j.yaml @@ -52,9 +52,9 @@ services: restart: on-failure:100 volumes: - grafana-storage:/var/lib/grafana - - ./grafana/provisioning/:/etc/grafana/provisioning/dashboards/ - - ./grafana/provisioning/:/etc/grafana/provisioning/datasources/ - - ./grafana/dashboards/:/var/lib/grafana/dashboards/ + - ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/dashboards/ + - ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/datasources/ + - ${CONFIGDIR}/grafana/dashboards/:/var/lib/grafana/dashboards/ graph-rag: command: - graph-rag @@ -177,7 +177,7 @@ services: - 9090:9090 restart: on-failure:100 volumes: - - ./prometheus:/etc/prometheus/ + - ${CONFIGDIR}/prometheus:/etc/prometheus/ - prometheus-data:/prometheus prompt: command: diff --git a/deploy/docker-compose/tg-launch-ollama-cassandra.yaml b/deploy/docker-compose/tg-launch-ollama-cassandra.yaml index 051a5e63..b827199d 100644 --- a/deploy/docker-compose/tg-launch-ollama-cassandra.yaml +++ b/deploy/docker-compose/tg-launch-ollama-cassandra.yaml @@ -69,9 +69,9 @@ services: restart: on-failure:100 volumes: - grafana-storage:/var/lib/grafana - - ./grafana/provisioning/:/etc/grafana/provisioning/dashboards/ - - ./grafana/provisioning/:/etc/grafana/provisioning/datasources/ - - ./grafana/dashboards/:/var/lib/grafana/dashboards/ + - ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/dashboards/ + - ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/datasources/ + - ${CONFIGDIR}/grafana/dashboards/:/var/lib/grafana/dashboards/ graph-rag: command: - graph-rag @@ -176,7 +176,7 @@ services: - 9090:9090 restart: on-failure:100 volumes: - - ./prometheus:/etc/prometheus/ + - ${CONFIGDIR}/prometheus:/etc/prometheus/ - prometheus-data:/prometheus prompt: command: diff --git a/deploy/docker-compose/tg-launch-ollama-neo4j.yaml b/deploy/docker-compose/tg-launch-ollama-neo4j.yaml index a3e7fa40..bad61b37 100644 --- a/deploy/docker-compose/tg-launch-ollama-neo4j.yaml +++ b/deploy/docker-compose/tg-launch-ollama-neo4j.yaml @@ -52,9 +52,9 @@ services: restart: on-failure:100 volumes: - grafana-storage:/var/lib/grafana - - ./grafana/provisioning/:/etc/grafana/provisioning/dashboards/ - - ./grafana/provisioning/:/etc/grafana/provisioning/datasources/ - - ./grafana/dashboards/:/var/lib/grafana/dashboards/ + - ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/dashboards/ + - ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/datasources/ + - ${CONFIGDIR}/grafana/dashboards/:/var/lib/grafana/dashboards/ graph-rag: command: - graph-rag @@ -177,7 +177,7 @@ services: - 9090:9090 restart: on-failure:100 volumes: - - ./prometheus:/etc/prometheus/ + - ${CONFIGDIR}/prometheus:/etc/prometheus/ - prometheus-data:/prometheus prompt: command: diff --git a/deploy/docker-compose/tg-launch-openai-cassandra.yaml b/deploy/docker-compose/tg-launch-openai-cassandra.yaml index d3580736..c498c630 100644 --- a/deploy/docker-compose/tg-launch-openai-cassandra.yaml +++ b/deploy/docker-compose/tg-launch-openai-cassandra.yaml @@ -69,9 +69,9 @@ services: restart: on-failure:100 volumes: - grafana-storage:/var/lib/grafana - - ./grafana/provisioning/:/etc/grafana/provisioning/dashboards/ - - ./grafana/provisioning/:/etc/grafana/provisioning/datasources/ - - ./grafana/dashboards/:/var/lib/grafana/dashboards/ + - ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/dashboards/ + - ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/datasources/ + - ${CONFIGDIR}/grafana/dashboards/:/var/lib/grafana/dashboards/ graph-rag: command: - graph-rag @@ -176,7 +176,7 @@ services: - 9090:9090 restart: on-failure:100 volumes: - - ./prometheus:/etc/prometheus/ + - ${CONFIGDIR}/prometheus:/etc/prometheus/ - prometheus-data:/prometheus prompt: command: diff --git a/deploy/docker-compose/tg-launch-openai-neo4j.yaml b/deploy/docker-compose/tg-launch-openai-neo4j.yaml index 37ff30a4..c5577b8f 100644 --- a/deploy/docker-compose/tg-launch-openai-neo4j.yaml +++ b/deploy/docker-compose/tg-launch-openai-neo4j.yaml @@ -52,9 +52,9 @@ services: restart: on-failure:100 volumes: - grafana-storage:/var/lib/grafana - - ./grafana/provisioning/:/etc/grafana/provisioning/dashboards/ - - ./grafana/provisioning/:/etc/grafana/provisioning/datasources/ - - ./grafana/dashboards/:/var/lib/grafana/dashboards/ + - ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/dashboards/ + - ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/datasources/ + - ${CONFIGDIR}/grafana/dashboards/:/var/lib/grafana/dashboards/ graph-rag: command: - graph-rag @@ -177,7 +177,7 @@ services: - 9090:9090 restart: on-failure:100 volumes: - - ./prometheus:/etc/prometheus/ + - ${CONFIGDIR}/prometheus:/etc/prometheus/ - prometheus-data:/prometheus prompt: command: diff --git a/deploy/docker-compose/tg-launch-vertexai-cassandra.yaml b/deploy/docker-compose/tg-launch-vertexai-cassandra.yaml index a7d421a8..1f7272d7 100644 --- a/deploy/docker-compose/tg-launch-vertexai-cassandra.yaml +++ b/deploy/docker-compose/tg-launch-vertexai-cassandra.yaml @@ -69,9 +69,9 @@ services: restart: on-failure:100 volumes: - grafana-storage:/var/lib/grafana - - ./grafana/provisioning/:/etc/grafana/provisioning/dashboards/ - - ./grafana/provisioning/:/etc/grafana/provisioning/datasources/ - - ./grafana/dashboards/:/var/lib/grafana/dashboards/ + - ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/dashboards/ + - ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/datasources/ + - ${CONFIGDIR}/grafana/dashboards/:/var/lib/grafana/dashboards/ graph-rag: command: - graph-rag @@ -176,7 +176,7 @@ services: - 9090:9090 restart: on-failure:100 volumes: - - ./prometheus:/etc/prometheus/ + - ${CONFIGDIR}/prometheus:/etc/prometheus/ - prometheus-data:/prometheus prompt: command: @@ -673,7 +673,7 @@ services: image: docker.io/trustgraph/trustgraph-flow:0.10.0 restart: on-failure:100 volumes: - - ./vertexai:/vertexai + - ${CONFIGDIR}/./vertexai:/vertexai text-completion-rag: command: - text-completion-vertexai @@ -704,7 +704,7 @@ services: image: docker.io/trustgraph/trustgraph-flow:0.10.0 restart: on-failure:100 volumes: - - ./vertexai:/vertexai + - ${CONFIGDIR}/./vertexai:/vertexai vectorize: command: - embeddings-vectorize diff --git a/deploy/docker-compose/tg-launch-vertexai-neo4j.yaml b/deploy/docker-compose/tg-launch-vertexai-neo4j.yaml index 4cdc5127..f606bcee 100644 --- a/deploy/docker-compose/tg-launch-vertexai-neo4j.yaml +++ b/deploy/docker-compose/tg-launch-vertexai-neo4j.yaml @@ -52,9 +52,9 @@ services: restart: on-failure:100 volumes: - grafana-storage:/var/lib/grafana - - ./grafana/provisioning/:/etc/grafana/provisioning/dashboards/ - - ./grafana/provisioning/:/etc/grafana/provisioning/datasources/ - - ./grafana/dashboards/:/var/lib/grafana/dashboards/ + - ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/dashboards/ + - ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/datasources/ + - ${CONFIGDIR}/grafana/dashboards/:/var/lib/grafana/dashboards/ graph-rag: command: - graph-rag @@ -177,7 +177,7 @@ services: - 9090:9090 restart: on-failure:100 volumes: - - ./prometheus:/etc/prometheus/ + - ${CONFIGDIR}/prometheus:/etc/prometheus/ - prometheus-data:/prometheus prompt: command: @@ -674,7 +674,7 @@ services: image: docker.io/trustgraph/trustgraph-flow:0.10.0 restart: on-failure:100 volumes: - - ./vertexai:/vertexai + - ${CONFIGDIR}/./vertexai:/vertexai text-completion-rag: command: - text-completion-vertexai @@ -705,7 +705,7 @@ services: image: docker.io/trustgraph/trustgraph-flow:0.10.0 restart: on-failure:100 volumes: - - ./vertexai:/vertexai + - ${CONFIGDIR}/./vertexai:/vertexai vectorize: command: - embeddings-vectorize diff --git a/deploy/docker-compose/tg-storage-cassandra.yaml b/deploy/docker-compose/tg-storage-cassandra.yaml index 6f32f90f..c4d90179 100644 --- a/deploy/docker-compose/tg-storage-cassandra.yaml +++ b/deploy/docker-compose/tg-storage-cassandra.yaml @@ -33,9 +33,9 @@ services: restart: on-failure:100 volumes: - grafana-storage:/var/lib/grafana - - ./grafana/provisioning/:/etc/grafana/provisioning/dashboards/ - - ./grafana/provisioning/:/etc/grafana/provisioning/datasources/ - - ./grafana/dashboards/:/var/lib/grafana/dashboards/ + - ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/dashboards/ + - ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/datasources/ + - ${CONFIGDIR}/grafana/dashboards/:/var/lib/grafana/dashboards/ init-pulsar: command: - sh @@ -70,7 +70,7 @@ services: - 9090:9090 restart: on-failure:100 volumes: - - ./prometheus:/etc/prometheus/ + - ${CONFIGDIR}/prometheus:/etc/prometheus/ - prometheus-data:/prometheus pulsar: command: diff --git a/deploy/docker-compose/tg-storage-neo4j.yaml b/deploy/docker-compose/tg-storage-neo4j.yaml index 3f9594c5..bb9d858e 100644 --- a/deploy/docker-compose/tg-storage-neo4j.yaml +++ b/deploy/docker-compose/tg-storage-neo4j.yaml @@ -16,9 +16,9 @@ services: restart: on-failure:100 volumes: - grafana-storage:/var/lib/grafana - - ./grafana/provisioning/:/etc/grafana/provisioning/dashboards/ - - ./grafana/provisioning/:/etc/grafana/provisioning/datasources/ - - ./grafana/dashboards/:/var/lib/grafana/dashboards/ + - ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/dashboards/ + - ${CONFIGDIR}/grafana/provisioning/:/etc/grafana/provisioning/datasources/ + - ${CONFIGDIR}/grafana/dashboards/:/var/lib/grafana/dashboards/ init-pulsar: command: - sh @@ -71,7 +71,7 @@ services: - 9090:9090 restart: on-failure:100 volumes: - - ./prometheus:/etc/prometheus/ + - ${CONFIGDIR}/prometheus:/etc/prometheus/ - prometheus-data:/prometheus pulsar: command: diff --git a/scripts/graph-show b/scripts/graph-show index 63da0e19..a737c97b 100755 --- a/scripts/graph-show +++ b/scripts/graph-show @@ -8,7 +8,7 @@ import argparse import os from trustgraph.clients.triples_query_client import TriplesQueryClient -default_pulsar_host = os.getenv("PULSAR_HOST", 'pulsar://pulsar:6650') +default_pulsar_host = os.getenv("PULSAR_HOST", 'pulsar://localhost:6650') def show_graph(pulsar): diff --git a/scripts/graph-to-turtle b/scripts/graph-to-turtle index a1c0e000..bff03fc6 100755 --- a/scripts/graph-to-turtle +++ b/scripts/graph-to-turtle @@ -11,7 +11,7 @@ import rdflib import io import sys -default_pulsar_host = os.getenv("PULSAR_HOST", 'pulsar://pulsar:6650') +default_pulsar_host = os.getenv("PULSAR_HOST", 'pulsar://localhost:6650') def show_graph(pulsar): diff --git a/templates/components/grafana.jsonnet b/templates/components/grafana.jsonnet index 133e49c1..b59bbd00 100644 --- a/templates/components/grafana.jsonnet +++ b/templates/components/grafana.jsonnet @@ -10,7 +10,7 @@ local images = import "values/images.jsonnet"; local vol = engine.volume("prometheus-data").with_size("20G"); local cfgVol = engine.configVolume( - "prometheus-cfg", "./prometheus", + "prometheus-cfg", "prometheus", { "prometheus.yml": importstr "prometheus/prometheus.yml", } @@ -50,7 +50,7 @@ local images = import "values/images.jsonnet"; local vol = engine.volume("grafana-storage").with_size("20G"); local provDashVol = engine.configVolume( - "prov-dash", "./grafana/provisioning/", + "prov-dash", "grafana/provisioning/", { "dashboard.yml": importstr "grafana/provisioning/dashboard.yml", @@ -59,7 +59,7 @@ local images = import "values/images.jsonnet"; ); local provDataVol = engine.configVolume( - "prov-data", "./grafana/provisioning/", + "prov-data", "grafana/provisioning/", { "datasource.yml": importstr "grafana/provisioning/datasource.yml", @@ -68,7 +68,7 @@ local images = import "values/images.jsonnet"; ); local dashVol = engine.configVolume( - "dashboards", "./grafana/dashboards/", + "dashboards", "grafana/dashboards/", { "dashboard.json": importstr "grafana/dashboards/dashboard.json", diff --git a/templates/engine/docker-compose.jsonnet b/templates/engine/docker-compose.jsonnet index d82f9a52..4c9f9bdd 100644 --- a/templates/engine/docker-compose.jsonnet +++ b/templates/engine/docker-compose.jsonnet @@ -78,7 +78,7 @@ (if std.length(container.volumes) > 0 then { volumes: [ - "%s:%s" % [vol.volume.name, vol.mount] + "%s:%s" % [vol.volume.volid, vol.mount] for vol in container.volumes ] } @@ -126,6 +126,8 @@ name: name, + volid:: name, + with_size:: function(size) self + { size: size }, add:: function() { @@ -143,6 +145,8 @@ name: dir, + volid:: "${CONFIGDIR}/" + dir, + with_size:: function(size) self + { size: size }, add:: function() { @@ -157,6 +161,8 @@ name: dir, + volid:: "${CONFIGDIR}/" + dir, + with_size:: function(size) self + { size: size }, add:: function() {