Compare commits

...

3 commits

Author SHA1 Message Date
Nico Schottelius
4dffeb3bf6 finish move of content to new elementweb role 2023-12-04 09:01:41 +01:00
Nico Schottelius
d3ca975bdb more role stuff 2023-12-04 08:59:22 +01:00
Nico Schottelius
91421c02e5 phase in role elementweb 2023-12-04 08:57:12 +01:00
10 changed files with 63 additions and 8 deletions

View file

@ -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

View file

@ -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: matrix_service == "elementweb"

View file

@ -93,6 +93,7 @@
loop: "{{ docker_compose }}"
tags:
- dir
- name: Copy docker-compose contents
ansible.builtin.copy:
src: files/{{ item }}/

View file

@ -0,0 +1,28 @@
- name: Copy docker-compose contents
ansible.builtin.copy:
src: files/basedir/
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
- test
- 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

View file

@ -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;

View file

@ -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 }}"