diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2019-10-17 21:19:05 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2019-10-17 21:19:05 +0200 |
| commit | 15f73c910e8f400035a4de6a28cebd5ae0655aae (patch) | |
| tree | 0b445afd529637038e2571c49838e8f8b154bf68 /roles/etherpad-lite | |
| parent | basic etherpad installation works now (diff) | |
etherpad is still a mess but we will keep it at this state for now
Diffstat (limited to 'roles/etherpad-lite')
| -rw-r--r-- | roles/etherpad-lite/tasks/main.yml | 11 | ||||
| -rw-r--r-- | roles/etherpad-lite/templates/pod-with-mariadb.yml.j2 | 8 |
2 files changed, 2 insertions, 17 deletions
diff --git a/roles/etherpad-lite/tasks/main.yml b/roles/etherpad-lite/tasks/main.yml index 05bf32ce..6d4551db 100644 --- a/roles/etherpad-lite/tasks/main.yml +++ b/roles/etherpad-lite/tasks/main.yml @@ -90,17 +90,6 @@ copy: content: "{{ item.value.settings | combine({'ip': '0.0.0.0', 'port': 9001}) | to_nice_json }}" dest: "{{ etherpad_lite_base_path }}/{{ item.key }}/config/settings.json" - mode: 0644 - owner: "{{ etherpad_lite_app_uid }}" - group: "{{ etherpad_lite_app_gid }}" - -- name: create db credentials json - loop: "{{ etherpad_lite_instances | dict2items }}" - loop_control: - label: "{{ item.key }}" - copy: - content: "{{ item.value.credentials | to_nice_json }}" - dest: "{{ etherpad_lite_base_path }}/{{ item.key }}/config/credentials.json" mode: 0600 owner: "{{ etherpad_lite_app_uid }}" group: "{{ etherpad_lite_app_gid }}" diff --git a/roles/etherpad-lite/templates/pod-with-mariadb.yml.j2 b/roles/etherpad-lite/templates/pod-with-mariadb.yml.j2 index 0e0b6b8b..a4acdd21 100644 --- a/roles/etherpad-lite/templates/pod-with-mariadb.yml.j2 +++ b/roles/etherpad-lite/templates/pod-with-mariadb.yml.j2 @@ -7,7 +7,7 @@ spec: allowPrivilegeEscalation: false containers: - name: etherpad-lite - image: etherpad/etherpad:{{ item.value.version }} + image: spreadspace/etherpad-lite:{{ item.value.version }} # securityContext: # runAsUser: {{ etherpad_lite_app_uid }} # runAsGroup: {{ etherpad_lite_app_gid }} @@ -16,13 +16,9 @@ spec: memory: "4Gi" volumeMounts: - name: config - mountPath: /opt/etherpad/settings.json + mountPath: /opt/etherpad-lite/settings.json subPath: settings.json readOnly: true - - name: config - mountPath: /opt/etherpad/credentials.json - subPath: credentials.json - readOnly: true ports: - containerPort: 9001 hostPort: {{ item.value.port }} |