diff options
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/apps/node-red/instance/tasks/main.yml | 14 | ||||
| -rw-r--r-- | roles/apps/whawty/auth/instance/templates/pod-spec.yml.j2 | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/roles/apps/node-red/instance/tasks/main.yml b/roles/apps/node-red/instance/tasks/main.yml index 410a1b9f..63d03539 100644 --- a/roles/apps/node-red/instance/tasks/main.yml +++ b/roles/apps/node-red/instance/tasks/main.yml @@ -1,10 +1,12 @@ --- -## TODO: add storage handling! -- set_fact: - node_red_instance_basepath: "/srv/node-red/{{ node_red_instance }}" -## +- name: prepare storage volume + vars: + storage_volume: "{{ node_red_instances[node_red_instance].storage }}" + include_role: + name: "storage/{{ node_red_instances[node_red_instance].storage.type }}/volume" -## TODO: custom user +- set_fact: + node_red_instance_basepath: "{{ storage_volume_mountpoint }}" - name: create instance directories loop: @@ -182,8 +184,10 @@ requestCert: true, minVersion: 'TLSv1.3' }, + {% if 'extra_settings' in node_red_instances[node_red_instance] %} {{ node_red_instances[node_red_instance].extra_settings | indent(4) }} + {% endif %} ** **************************************** diff --git a/roles/apps/whawty/auth/instance/templates/pod-spec.yml.j2 b/roles/apps/whawty/auth/instance/templates/pod-spec.yml.j2 index 50f8e0c2..3677d84b 100644 --- a/roles/apps/whawty/auth/instance/templates/pod-spec.yml.j2 +++ b/roles/apps/whawty/auth/instance/templates/pod-spec.yml.j2 @@ -22,10 +22,6 @@ containers: readOnly: true - name: store mountPath: /store - env: -{# TODO: remove debug output #} - - name: WHAWTY_AUTH_DEBUG - value: "1" ports: - containerPort: {{ whawty_auth_instances[whawty_auth_instance].port }} hostPort: {{ whawty_auth_instances[whawty_auth_instance].port }} |