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'