diff --git a/elao.app.docker/.manala/ansible/inventories/system.yaml.tmpl b/elao.app.docker/.manala/ansible/inventories/system.yaml.tmpl index 32c58aaa..0488e5f1 100644 --- a/elao.app.docker/.manala/ansible/inventories/system.yaml.tmpl +++ b/elao.app.docker/.manala/ansible/inventories/system.yaml.tmpl @@ -9,7 +9,7 @@ system: {{- end }} # Variables - apt_architecture: {{ `"{{ ansible_architecture | manala.roles.apt_architecture }}"` }} + apt_architecture: {{ `"{{ ansible_facts.architecture | manala.roles.apt_architecture }}"` }} # Alternatives system_alternatives: false diff --git a/elao.app.docker/.manala/ansible/roles/release/tasks/main.yml b/elao.app.docker/.manala/ansible/roles/release/tasks/main.yml index baa76449..c82e8930 100644 --- a/elao.app.docker/.manala/ansible/roles/release/tasks/main.yml +++ b/elao.app.docker/.manala/ansible/roles/release/tasks/main.yml @@ -89,12 +89,12 @@ git {{ release_author|ternary(release_author|regex_replace(release_email_regex, '-c user.name="\g" -c user.email="\g"'), '') }} commit --allow-empty --message "{{ - ansible_date_time.year - ~ ansible_date_time.month - ~ ansible_date_time.day - ~ ansible_date_time.hour - ~ ansible_date_time.minute - ~ ansible_date_time.second + ansible_facts.date_time.year + ~ ansible_facts.date_time.month + ~ ansible_facts.date_time.day + ~ ansible_facts.date_time.hour + ~ ansible_facts.date_time.minute + ~ ansible_facts.date_time.second }} Original commit: https://{{ __original_repo.stdout|regex_replace(release_git_url_regex, '\g/\g/\g') diff --git a/elao.app.docker/.manala/ansible/system.yaml b/elao.app.docker/.manala/ansible/system.yaml index 9a4609c3..694acbf4 100644 --- a/elao.app.docker/.manala/ansible/system.yaml +++ b/elao.app.docker/.manala/ansible/system.yaml @@ -67,7 +67,7 @@ # Redis - preference: redis@backports state: "{{ 'present' if ( - (system_redis_version|string == '6.0') and (ansible_distribution_release in ['buster']) + (system_redis_version|string == '6.0') and (ansible_facts.distribution_release in ['buster']) ) else 'ignore' }}" # GitHub CLI - preference: gh@github_cli diff --git a/elao.app.docker/.manala/ansible/templates/php/xdebug.ini.j2 b/elao.app.docker/.manala/ansible/templates/php/xdebug.ini.j2 index fb7e2143..1a0c35ab 100644 --- a/elao.app.docker/.manala/ansible/templates/php/xdebug.ini.j2 +++ b/elao.app.docker/.manala/ansible/templates/php/xdebug.ini.j2 @@ -1,6 +1,6 @@ {%- set config = item.config|default({}) -%} -{%- set host = ansible_env.MANALA_HOST_OS | default('linux') -%} +{%- set host = ansible_facts.env.MANALA_HOST_OS | default('linux') -%} {% if host == 'linux' %} # Linux xdebug.discover_client_host = 1 diff --git a/elao.app.docker/.manala/docker/Dockerfile.tmpl b/elao.app.docker/.manala/docker/Dockerfile.tmpl index e00c4b29..4dbf9f39 100644 --- a/elao.app.docker/.manala/docker/Dockerfile.tmpl +++ b/elao.app.docker/.manala/docker/Dockerfile.tmpl @@ -235,6 +235,7 @@ force_color = True\n\ display_skipped_hosts = False\n\ retry_files_enabled = False\n\ stdout_callback = community.general.yaml\n\ +inject_facts_as_vars = False\n\ [ssh_connection]\n\ pipelining = True\n\ [privilege_escalation]\n\