From 91421c02e569f71867b30d9193ff04a2cc63635c Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Mon, 4 Dec 2023 08:57:12 +0100 Subject: [PATCH 1/3] phase in role elementweb --- .../files/basedir}/.env | 0 .../files/basedir}/config.json | 0 ansible/roles/elementweb/tasks/main.yml | 27 +++++++++++++++++++ .../templates}/nginx/elementweb.conf | 5 ++++ 4 files changed, 32 insertions(+) rename ansible/roles/{docker-compose/files/elementweb => elementweb/files/basedir}/.env (100%) rename ansible/roles/{docker-compose/files/elementweb => elementweb/files/basedir}/config.json (100%) create mode 100644 ansible/roles/elementweb/tasks/main.yml rename ansible/roles/{docker-compose/files/elementweb => elementweb/templates}/nginx/elementweb.conf (68%) diff --git a/ansible/roles/docker-compose/files/elementweb/.env b/ansible/roles/elementweb/files/basedir/.env similarity index 100% rename from ansible/roles/docker-compose/files/elementweb/.env rename to ansible/roles/elementweb/files/basedir/.env diff --git a/ansible/roles/docker-compose/files/elementweb/config.json b/ansible/roles/elementweb/files/basedir/config.json similarity index 100% rename from ansible/roles/docker-compose/files/elementweb/config.json rename to ansible/roles/elementweb/files/basedir/config.json diff --git a/ansible/roles/elementweb/tasks/main.yml b/ansible/roles/elementweb/tasks/main.yml new file mode 100644 index 0000000..87cfaf0 --- /dev/null +++ b/ansible/roles/elementweb/tasks/main.yml @@ -0,0 +1,27 @@ +- name: Copy docker-compose contents + ansible.builtin.copy: + src: files/basedir/{{ item }}/ + dest: /home/{{ ansible_user }}/docker_compose/{{ docker_compose }} + owner: "{{ ansible_user }}" + mode: '0644' + tags: + - files + - test + +- name: Create nginx dir + ansible.builtin.file: + path: /home/{{ ansible_user }}/docker_compose/nginx + state: directory + owner: "{{ ansible_user }}" + mode: '0755' + tags: + - dir + +- name: Create nginx config + ansible.builtin.template: + src: "nginx/elementweb.conf" + dest: /home/{{ ansible_user }}/docker_compose/nginx/elementweb.conf + owner: "{{ ansible_user }}" + mode: '0644' + tags: + - test diff --git a/ansible/roles/docker-compose/files/elementweb/nginx/elementweb.conf b/ansible/roles/elementweb/templates/nginx/elementweb.conf similarity index 68% rename from ansible/roles/docker-compose/files/elementweb/nginx/elementweb.conf rename to ansible/roles/elementweb/templates/nginx/elementweb.conf index 2370b4d..c1923d3 100644 --- a/ansible/roles/docker-compose/files/elementweb/nginx/elementweb.conf +++ b/ansible/roles/elementweb/templates/nginx/elementweb.conf @@ -6,6 +6,11 @@ server { ssl_certificate /ssl/chain.crt; ssl_certificate_key /ssl/certificate.keyplain; + access_log /var/log/nginx/element/access-{{ inventory_hostname }}.log main; + access_log /var/log/nginx/access-{{ inventory_hostname }}.log main; + error_log /var/log/nginx/element/error-{{ inventory_hostname }}.log notice; + error_log /var/log/nginx/error-{{ inventory_hostname }}.log notice; + error_page 403 404 /403_404.html; location = /403_404.html { default_type application/json; From d3ca975bdb40f146bed83d409f74bf06b3f66219 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Mon, 4 Dec 2023 08:59:22 +0100 Subject: [PATCH 2/3] more role stuff --- ansible/playbook/runa.yml | 8 ++++++ ansible/roles/docker-compose/tasks/main.yml | 1 + ansible/roles/elementweb/tasks/main.yml | 1 + ansible/roles/synapse-base/tasks/main.yml | 27 +++++++++++++++------ 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/ansible/playbook/runa.yml b/ansible/playbook/runa.yml index ab31b95..9fc01ff 100644 --- a/ansible/playbook/runa.yml +++ b/ansible/playbook/runa.yml @@ -11,6 +11,7 @@ name: synapse-base tags: - synapse + - logdir when: '"synapse" in docker_compose' - name: SSL Certs include_role: @@ -24,3 +25,10 @@ tags: - docker when: docker_compose + - name: Add elementweb + include_role: + name: elementweb + tags: + - docker + - test + when: docker_compose == "elementweb" diff --git a/ansible/roles/docker-compose/tasks/main.yml b/ansible/roles/docker-compose/tasks/main.yml index 5e9cd6d..cc33bf5 100644 --- a/ansible/roles/docker-compose/tasks/main.yml +++ b/ansible/roles/docker-compose/tasks/main.yml @@ -93,6 +93,7 @@ loop: "{{ docker_compose }}" tags: - dir + - name: Copy docker-compose contents ansible.builtin.copy: src: files/{{ item }}/ diff --git a/ansible/roles/elementweb/tasks/main.yml b/ansible/roles/elementweb/tasks/main.yml index 87cfaf0..06e9be7 100644 --- a/ansible/roles/elementweb/tasks/main.yml +++ b/ansible/roles/elementweb/tasks/main.yml @@ -16,6 +16,7 @@ mode: '0755' tags: - dir + - test - name: Create nginx config ansible.builtin.template: diff --git a/ansible/roles/synapse-base/tasks/main.yml b/ansible/roles/synapse-base/tasks/main.yml index 4d05f76..63b5fac 100644 --- a/ansible/roles/synapse-base/tasks/main.yml +++ b/ansible/roles/synapse-base/tasks/main.yml @@ -12,11 +12,22 @@ owner: 991 tags: - directory -# - name: Create homeserver.yaml file -# ansible.builtin.copy: -# src: files/homeserver.yaml -# dest: /mnt/synapse_data/homeserver.yaml -# owner: "{{ ansible_user }}" -# mode: '0600' -# tags: -# - files +- name: Create logging base directory + ansible.builtin.file: + path: /mnt/logs/ + state: directory + mode: '0755' + owner: "root" + tags: + - dir + - logdir +- name: Create logging directory + ansible.builtin.file: + path: /mnt/logs/{{ item.name }} + state: directory + mode: '0755' + owner: "{{ item.uid }}" + tags: + - dir + - logdir + loop: "{{ logs_dirs }}" From 4dffeb3bf6af1f33d838cb2114f4fca9eec85e9d Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Mon, 4 Dec 2023 09:01:41 +0100 Subject: [PATCH 3/3] finish move of content to new elementweb role --- ansible/inventory/runa.yml | 2 ++ ansible/playbook/runa.yml | 2 +- .../files/elementweb => elementweb/files}/docker-compose.yaml | 0 .../files/elementweb => elementweb/files}/www/index.html | 0 ansible/roles/elementweb/tasks/main.yml | 2 +- 5 files changed, 4 insertions(+), 2 deletions(-) rename ansible/roles/{docker-compose/files/elementweb => elementweb/files}/docker-compose.yaml (100%) rename ansible/roles/{docker-compose/files/elementweb => elementweb/files}/www/index.html (100%) diff --git a/ansible/inventory/runa.yml b/ansible/inventory/runa.yml index 0a83dca..9559f96 100644 --- a/ansible/inventory/runa.yml +++ b/ansible/inventory/runa.yml @@ -9,6 +9,7 @@ runa: - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE9P5aA5O4Vsgg5sB6Ojk+z1f5F97hvwRRd3gi+a+GGq nico-2016" - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCjWYALKYHTs6mX7GrrpxR0TPhxwVplmmcTPAA7zjhVCZajcUwLduy3Yct4YXBwRiEydGyhExoVVB8i7UhyvMQsTheRk751uJZyKWIkqbQJoJx1LPmZ00EJNaiIEiJih762D9KWZ1GoLBfB4QAEmoWDzVm3CFJ9tBVEsQ7i9BH+Cbe2GsnqflfWjb09bZhaOSTrmWNcBxgpXirZyi8EI0SrVtmnwVzdH8HXOalvFqW57aY1q/RjE1DIh7Pp+RiGscZz6CJ5oJtSEKbjZ2aUe4gomlQwYmGNVk22RdjvB7+0KDXMwdp702Z5ETv2xYk9v5YrA/lsWk/9JX8vGYb5Y5N+GGG9woZ5M1JIRjXduxNf68VMSQbxZTeonoWkh6Q8CNgDsHyyAyNuPAss7SCCGk5G8s0q/4IDGfV0A1QKFhHOId1qEqGQtLKaRbo6ZTi9wXSieA5D3kMNh+WWufutxI/t56USzNSaeYjqpYwiICBZ8jzWBJrDamiFne4KkW3PTao7Czv6yIeXHHfGYDtdvXppMSjamw+rbA/btTes5X+pYlFxniO5sZJUa+jnJOo3SYBGoRYftqxw7Usqm/i/koHP1RM8L3Iq+/xXNr5+AyFzRBCUUuDfRw1MY1n9OJXvYykNGth4ablfVFcP1R8Qq7jVGksK1dzckzD9SmCdubzwtw== nico-2014" + matrix_service: "" logs_dirs: - name: nginx uid: 101 @@ -33,6 +34,7 @@ runa: mtx-elem-2.lat.internal.ru.com: docker_compose: - elementweb + matrix_service: "elementweb" mtx-syna-1.lat.internal.ru.com: docker_compose: - synapse diff --git a/ansible/playbook/runa.yml b/ansible/playbook/runa.yml index 9fc01ff..c9b2cfd 100644 --- a/ansible/playbook/runa.yml +++ b/ansible/playbook/runa.yml @@ -31,4 +31,4 @@ tags: - docker - test - when: docker_compose == "elementweb" + when: matrix_service == "elementweb" diff --git a/ansible/roles/docker-compose/files/elementweb/docker-compose.yaml b/ansible/roles/elementweb/files/docker-compose.yaml similarity index 100% rename from ansible/roles/docker-compose/files/elementweb/docker-compose.yaml rename to ansible/roles/elementweb/files/docker-compose.yaml diff --git a/ansible/roles/docker-compose/files/elementweb/www/index.html b/ansible/roles/elementweb/files/www/index.html similarity index 100% rename from ansible/roles/docker-compose/files/elementweb/www/index.html rename to ansible/roles/elementweb/files/www/index.html diff --git a/ansible/roles/elementweb/tasks/main.yml b/ansible/roles/elementweb/tasks/main.yml index 06e9be7..2f88241 100644 --- a/ansible/roles/elementweb/tasks/main.yml +++ b/ansible/roles/elementweb/tasks/main.yml @@ -1,6 +1,6 @@ - name: Copy docker-compose contents ansible.builtin.copy: - src: files/basedir/{{ item }}/ + src: files/basedir/ dest: /home/{{ ansible_user }}/docker_compose/{{ docker_compose }} owner: "{{ ansible_user }}" mode: '0644'