Account for adjusted variable nomenclature in roles.

README.md

@@ -25,7 +25,6 @@ The main goals of this project are:
 - [ONLYOFFICE Document Server](https://www.onlyoffice.com/) (integrates with Nextcloud)
 - [Collabora Online Development Edition](https://www.collaboraoffice.com/code/) (integrates with Nextcloud)
 - [Cryptpad](https://cryptpad.fr/)
-- [Coturn TURN/STUN server](https://github.com/coturn/coturn)
 
 ### WIP
 

ansible.cfg

@@ -19,6 +19,3 @@ ssh_args = -o ControlMaster=auto -o ControlPersist=600s -o ServerAliveInterval=6
 control_path = %(directory)s/%%h-%%r
 pipelining = True
 timeout = 10
-
-[persistent_connection]
-ssh_type = libssh

coturn.yml

@@ -1,7 +0,0 @@
----
-# coturn TURN server
-
-- hosts: coturn
-  become: true
-  roles:
-    - jotbe.coturn-docker

docker.yml

@@ -3,9 +3,7 @@
 
 - hosts: docker
   become: true
-  pre_tasks:
-    - name: Install pip packages for Docker
-      ansible.builtin.pip: 
-        name: "{{ pip_install_packages }}"
   roles:
+    - geerlingguy.pip
+    - geerlingguy.docker
     - jotbe.traefik-docker

group_vars/docker.yml

@@ -1,6 +1,11 @@
-#pip_package: python3-pip
+pip_package: python3-pip
 pip_install_packages:
-  - docker
-  - docker-compose
+  - name: docker
+  - name: docker-compose
+docker_edition: "ce"
+docker_version: "19.03.5"
+docker_package: "docker-{{ docker_edition }}"
+docker_package_state: present
+docker_compose_version: "1.25.0"
 docker_users:
   - deploy

group_vars/vagrant.yml

@@ -16,11 +16,14 @@ firewall_allowed_udp_ports:
 users:
   - deploy
 sudoers: []
+docker_user: deploy
+cryptpad_install_user: "{{ docker_user }}"
 cryptpad_virtual_host: pad.satt.local
 cryptpad_safe_virtual_host: pad-sandbox.satt.local
 cryptpad_admin_email: admin@example.tld
 cryptpad_block_daily_check: yes
-mariadb_root_password: password
+nextcloud_install_user: "{{ docker_user }}"
+nextcloud_mariadb_root_password: password
 nextcloud_mariadb_user: nextcloud
 nextcloud_mariadb_password: password
 nextcloud_admin_user: admin
@@ -31,15 +34,18 @@ nextcloud_overwrite_host: nextcloud.satt.local
 nextcloud_overwrite_protocol: http
 nextcloud_enable_restic_compose_backup: False
 nextcloud_virtual_host: nextcloud.satt.local
+collabora_install_user: "{{ docker_user }}"
 collabora_virtual_host: collabora.satt.local
 collabora_domain_regex_pattern: nextcloud\.satt\.local
 collabora_admin_user: admin
 collabora_admin_password: password
+onlyoffice_install_user: "{{ docker_user }}"
 onlyoffice_virtual_host: documentserver.satt.local
 onlyoffice_allow_origin_list: "{{ nextcloud_overwrite_cli_url }}"
 onlyoffice_jwt_enabled: "true"
 onlyoffice_jwt_secret: topsecrettoken
 onlyoffice_jwt_header: Authorization
+jitsi_install_user: "{{ docker_user }}"
 jitsi_public_url: https://jitsi.satt.local
 jitsi_docker_host_address: "{{ ansible_host }}"
 jitsi_exposed_http_port: 8000
@@ -49,11 +55,10 @@ jitsi_enable_letsencrypt: False
 jitsi_virtual_host: jitsi.satt.local
 jitsi_jvb_stun_servers: meet-jit-si-turnrelay.jitsi.net:443
 jitsi_web_channel_last_n: 2
-docker_user: deploy
-traefik:
-  expose_internally: True
-  expose_externally: False
-  enable_acme: False
-  use_acme_staging: False
-  dns_challenge_provider: False
+traefik_install_user: "{{ docker_user }}"
+traefik_expose_internally: True
+traefik_expose_externally: False
+traefik_enable_acme: False
+traefik_use_acme_staging: False
+traefik_dns_challenge_provider: False
 

requirements.yml

@@ -1,35 +1,25 @@
-collections:
-  - community.docker
+- geerlingguy.firewall
+- geerlingguy.pip
+- geerlingguy.docker
 
-roles:
-  - geerlingguy.firewall
-  - geerlingguy.pip
-  # - geerlingguy.docker
-
-  - name: jotbe.common
-    src: https://git.jotbe.io/jotbe/ansible-role-common.git
-    scm: git
-  - name: jotbe.traefik-docker
-    src: https://git.jotbe.io/jotbe/ansible-role-traefik-docker.git
-    scm: git
-  - name: jotbe.nextcloud-docker
-    version: v1.0.2
-    src: https://git.jotbe.io/jotbe/ansible-role-nextcloud-docker.git
-    scm: git
-  - name: jotbe.coturn-docker
-    src: https://git.jotbe.io/jotbe/ansible-role-coturn-docker.git
-    scm: git
-  - name: jotbe.jitsi-docker
-    version: v1.0.0
-    src: https://git.jotbe.io/jotbe/ansible-role-jitsi-docker.git
-    scm: git
-  - name: jotbe.collabora-online-docker
-    version: v1.0.0
-    src: https://git.jotbe.io/jotbe/ansible-role-collabora-online-docker.git
-    scm: git
-  - name: jotbe.onlyoffice-document-server-docker
-    src: https://git.jotbe.io/jotbe/ansible-role-onlyoffice-document-server-docker.git
-    scm: git
-  - name: jotbe.cryptpad-docker
-    src: https://git.jotbe.io/jotbe/ansible-role-cryptpad-docker.git
-    scm: git
+- name: jotbe.common
+  src: https://git.jotbe.io/jotbe/ansible-role-common.git
+  scm: git
+- name: jotbe.traefik-docker
+  src: https://git.jotbe.io/jotbe/ansible-role-traefik-docker.git
+  scm: git
+- name: jotbe.nextcloud-docker
+  src: https://git.jotbe.io/jotbe/ansible-role-nextcloud-docker.git
+  scm: git
+- name: jotbe.jitsi-docker
+  src: https://git.jotbe.io/jotbe/ansible-role-jitsi-docker.git
+  scm: git
+- name: jotbe.collabora-online-docker
+  src: https://git.jotbe.io/jotbe/ansible-role-collabora-online-docker.git
+  scm: git
+- name: jotbe.onlyoffice-document-server-docker
+  src: https://git.jotbe.io/jotbe/ansible-role-onlyoffice-document-server-docker.git
+  scm: git
+- name: jotbe.cryptpad-docker
+  src: https://git.jotbe.io/jotbe/ansible-role-cryptpad-docker.git
+  scm: git

site.yml

@@ -5,6 +5,5 @@
 - import_playbook: docker.yml
 - import_playbook: nextcloud.yml
 - import_playbook: collabora-online.yml
-- import_playbook: coturn.yml
 - import_playbook: jitsi.yml
 - import_playbook: cryptpad.yml