diff --git a/tasks/main.yml b/tasks/main.yml index 60b0d78b12dbeb340db043b400609517af121031..e9585449e1c8860394f5374a37ca2471c16593c4 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -31,11 +31,11 @@ - name: "Create Odoo docker directories on server in /home/docker/" ansible.builtin.file: - name: "/home/docker/{{ odoo_instance.key }}" - state: directory - owner: "root" - group: "root" - mode: "0755" + name: "/home/docker/{{ odoo_instance.key }}" + state: directory + owner: "root" + group: "root" + mode: "0755" loop: "{{ odoo_instances | dict2items }}" loop_control: label: "{{ odoo_instance.key }}" @@ -43,11 +43,11 @@ - name: "Create Odoo docker build directories on server in /home/docker/<instance>/odoo/" ansible.builtin.file: - name: "/home/docker/{{ odoo_instance.key }}/odoo/" - state: directory - owner: "root" - group: "root" - mode: "0755" + name: "/home/docker/{{ odoo_instance.key }}/odoo/" + state: directory + owner: "root" + group: "root" + mode: "0755" loop: "{{ odoo_instances | dict2items }}" loop_control: label: "{{ odoo_instance.key }}" @@ -57,11 +57,11 @@ - name: Copy private GitLab ssh keys file ansible.builtin.copy: - content: "{{ git_modules_privkey | default('') }}" - dest: "/home/docker/{{ odoo_instance.key }}/odoo/id_ed25519.sources" - owner: root - group: root - mode: '0400' + content: "{{ git_modules_privkey | default('') }}" + dest: "/home/docker/{{ odoo_instance.key }}/odoo/id_ed25519.sources" + owner: root + group: root + mode: '0400' loop: "{{ odoo_instances | dict2items }}" loop_control: label: "{{ odoo_instance.key }}" @@ -77,8 +77,8 @@ # - "remove ssh private keys" - name: "Add instance to rebuild and remove key lists if files was changed" set_fact: - instances_to_rebuild: "{{ instances_to_rebuild + [item.item.key] }}" - instances_to_remove_key: "{{ instances_to_remove_key + [item.item.key] }}" + instances_to_rebuild: "{{ instances_to_rebuild + [item.item.key] }}" + instances_to_remove_key: "{{ instances_to_remove_key + [item.item.key] }}" loop: "{{ result.results | flatten(levels=1) }}" loop_control: label: "{{ item.item.key }}" @@ -86,11 +86,11 @@ - name: Copy ssh config for connecting to LF Gitlab ansible.builtin.copy: - src: ssh_config - dest: "/home/docker/{{ odoo_instance.key }}/odoo/ssh_config" - owner: root - group: root - mode: '0444' + src: ssh_config + dest: "/home/docker/{{ odoo_instance.key }}/odoo/ssh_config" + owner: root + group: root + mode: '0444' loop: "{{ odoo_instances | dict2items }}" loop_control: label: "{{ odoo_instance.key }}" @@ -103,7 +103,7 @@ # - "rebuild odoo image" - name: "Add instance to rebuild list if files was changed" set_fact: - instances_to_rebuild: "{{ instances_to_rebuild + [item.item.key] }}" + instances_to_rebuild: "{{ instances_to_rebuild + [item.item.key] }}" loop: "{{ result.results | flatten(levels=1) }}" loop_control: label: "{{ item.item.key }}" @@ -111,11 +111,11 @@ - name: Copy private Git ssh keys file ansible.builtin.copy: - content: "{{ git_private_keys }}" - dest: "/home/docker/{{ odoo_instance.key }}/odoo/id_rsa" - owner: root - group: root - mode: '0400' + content: "{{ git_private_keys }}" + dest: "/home/docker/{{ odoo_instance.key }}/odoo/id_rsa" + owner: root + group: root + mode: '0400' loop: "{{ odoo_instances | dict2items }}" loop_control: label: "{{ odoo_instance.key }}" @@ -129,7 +129,7 @@ # - "rebuild odoo image" - name: "Add instance to rebuild list if files was changed" set_fact: - instances_to_rebuild: "{{ instances_to_rebuild + [item.item.key] }}" + instances_to_rebuild: "{{ instances_to_rebuild + [item.item.key] }}" loop: "{{ result.results | flatten(levels=1) }}" loop_control: label: "{{ item.item.key }}" @@ -154,11 +154,11 @@ template_modules_auto_install_enabled: "{{ (odoo_instance_setup.modules_auto_install_enabled | default(['web'])) | join(',') }}{% if odoo_instance.value.modules_auto_install_enabled is defined %},{{ odoo_instance.value.modules_auto_install_enabled | join(',') }}{% endif %}" template_extra_conf: "{{ odoo_instance.value.odoo_extra_conf }}" ansible.builtin.template: - src: "odoo.conf.j2" - dest: "/home/docker/{{ odoo_instance.key }}/odoo/odoo.conf" - owner: "root" - group: "root" - mode: "0600" + src: "odoo.conf.j2" + dest: "/home/docker/{{ odoo_instance.key }}/odoo/odoo.conf" + owner: "root" + group: "root" + mode: "0600" loop: "{{ odoo_instances | dict2items }}" loop_control: label: "{{ odoo_instance.key }}" @@ -171,7 +171,7 @@ # - "rebuild odoo image" - name: "Add instance to restart list if files was changed" set_fact: - instances_to_rebuild: "{{ instances_to_rebuild + [item.item.key] }}" + instances_to_rebuild: "{{ instances_to_rebuild + [item.item.key] }}" loop: "{{ result.results | flatten(levels=1) }}" loop_control: label: "{{ item.item.key }}" @@ -185,11 +185,11 @@ template_odoo_instance: "{{ odoo_instance }}" template_odoo_instance_setup: "{{ odoo_instance_setup }}" ansible.builtin.template: - src: Dockerfile.j2 - dest: "/home/docker/{{ odoo_instance.key }}/odoo/Dockerfile" - owner: root - group: root - mode: '0644' + src: Dockerfile.j2 + dest: "/home/docker/{{ odoo_instance.key }}/odoo/Dockerfile" + owner: root + group: root + mode: '0644' loop: "{{ odoo_instances | dict2items }}" loop_control: label: "{{ odoo_instance.key }}" @@ -203,8 +203,8 @@ # - "rebuild odoo image" - name: "Add instance to pull and rebuild lists if files was changed" set_fact: - instances_to_pull: "{{ instances_to_pull + [item.item.key] }}" - instances_to_rebuild: "{{ instances_to_rebuild + [item.item.key] }}" + instances_to_pull: "{{ instances_to_pull + [item.item.key] }}" + instances_to_rebuild: "{{ instances_to_rebuild + [item.item.key] }}" loop: "{{ result.results | flatten(levels=1) }}" loop_control: label: "{{ item.item.key }}" @@ -227,11 +227,11 @@ template_instance_need_build: "{{ test_instance_need_build }}" template_allow_index: "{{ odoo_instance.value.allow_index | default(false) }}" ansible.builtin.template: - src: docker-compose.yaml.j2 - dest: "/home/docker/{{ odoo_instance.key }}/docker-compose.yml" - owner: root - group: root - mode: '0400' + src: docker-compose.yaml.j2 + dest: "/home/docker/{{ odoo_instance.key }}/docker-compose.yml" + owner: root + group: root + mode: '0400' loop: "{{ odoo_instances | dict2items }}" loop_control: label: "{{ odoo_instance.key }}" @@ -247,7 +247,7 @@ - "metabase" - "odoo_config_compose_restart" set_fact: - instances_to_restart: "{{ instances_to_restart + [item.item.key] }}" + instances_to_restart: "{{ instances_to_restart + [item.item.key] }}" loop: "{{ result.results | flatten(levels=1) }}" loop_control: label: "{{ item.item.key }}" diff --git a/templates/Dockerfile.j2 b/templates/Dockerfile.j2 index 2113740e4d49bf907b7756eb9d1e347346ac72ad..23fead88a45c9cdae3e83a8eaae7eb8f511d80aa 100644 --- a/templates/Dockerfile.j2 +++ b/templates/Dockerfile.j2 @@ -36,7 +36,7 @@ RUN echo 'info: getting Odoo modules...' \ {% endfor %} # Get Le Filament Odoo modules from custom_modules variable. {% for repo in template_odoo_instance.value.custom_modules | default([]) | sort(attribute='repo') %} - && get_addons '{{ custom_modules_base_url }}/{{ repo.repo }}.git' '{{ repo.branch | default(template_odoo_instance_setup.odoo_version) }}' 'private_addons/{{ repo.repo | basename }}' \ + && get_addons '{{ custom_modules_base_url }}/{{ repo.repo }}' '{{ repo.branch | default(template_odoo_instance_setup.odoo_version) }}' 'private_addons/{{ repo.repo | basename }}' \ {% endfor %} # Get other Odoo modules from other_repos variable. {% for repo in template_odoo_instance.value.other_repos | default([]) | sort(attribute='repo') %}