diff --git a/playbooks/create-services-for-dnscontrol.yml b/playbooks/create-services-for-dnscontrol.yml index e81198a..26fab7d 100644 --- a/playbooks/create-services-for-dnscontrol.yml +++ b/playbooks/create-services-for-dnscontrol.yml @@ -3,9 +3,7 @@ hosts: localhost tasks: - name: Create the services json file - ansible.builtin.template: - src: "json.j2" + ansible.builtin.copy: dest: "{{ services_json_file }}" + content: "{{ all_services | services_to_dnscontrol | to_json }}" mode: "0644" - vars: - json: "{{ all_services | services_to_dnscontrol() }}" diff --git a/playbooks/roles/factorio/tasks/main.yml b/playbooks/roles/factorio/tasks/main.yml index a8c07aa..9955814 100644 --- a/playbooks/roles/factorio/tasks/main.yml +++ b/playbooks/roles/factorio/tasks/main.yml @@ -6,7 +6,6 @@ vars: svc: "{{ factorio_svc }}" env: "{{ factorio_env }}" - json: "{{ factorio_json }}" compose: "{{ factorio_compose }}" block: - name: Import prepare tasks for common service @@ -23,10 +22,10 @@ owner: "{{ factorio_uid }}" group: "{{ factorio_gid }}" become: true - - name: Template the server settings - ansible.builtin.template: - src: "json.j2" + - name: Create the server settings + ansible.builtin.copy: dest: "{{ (config_path, 'server-settings.json') | path_join }}" + content: '{{ factorio_json | to_json }}' mode: "0644" owner: "{{ factorio_uid }}" group: "{{ factorio_gid }}" diff --git a/playbooks/roles/gatus/tasks/main.yml b/playbooks/roles/gatus/tasks/main.yml index d5866dc..f30741d 100644 --- a/playbooks/roles/gatus/tasks/main.yml +++ b/playbooks/roles/gatus/tasks/main.yml @@ -12,7 +12,7 @@ - name: Create config ansible.builtin.copy: - dest: "{{ (service_path, 'config.yml') | path_join }}" + dest: "{{ (service_path, 'config.yaml') | path_join }}" content: '{{ gatus_yml | to_nice_yaml }}' mode: "0644" notify: Restart service {{ role_name }} diff --git a/playbooks/roles/lego/tasks/config.yml b/playbooks/roles/lego/tasks/config.yml index 266efcb..4a24701 100644 --- a/playbooks/roles/lego/tasks/config.yml +++ b/playbooks/roles/lego/tasks/config.yml @@ -7,10 +7,10 @@ path: "{{ config_path }}" state: directory mode: "0755" -- name: Copy the acme-dns-accounts - ansible.builtin.template: - src: "json.j2" +- name: Create the acme-dns-accounts + ansible.builtin.copy: dest: "{{ (config_path, 'acme-dns-accounts.json') | path_join }}" + content: '{{ vault_acmedns_registered | acmedns_to_lego | to_json }}' mode: "0644" - name: Copy the hook script ansible.builtin.copy: diff --git a/playbooks/roles/lego/tasks/main.yml b/playbooks/roles/lego/tasks/main.yml index 2360fa9..d7abd92 100644 --- a/playbooks/roles/lego/tasks/main.yml +++ b/playbooks/roles/lego/tasks/main.yml @@ -5,7 +5,6 @@ - name: Deploy {{ role_name }} vars: env: "{{ lego_env }}" - json: "{{ vault_acmedns_registered | acmedns_to_lego }}" compose: "{{ lego_compose }}" block: - name: Import prepare tasks for common service diff --git a/playbooks/templates/json.j2 b/playbooks/templates/json.j2 deleted file mode 100644 index fdf149e..0000000 --- a/playbooks/templates/json.j2 +++ /dev/null @@ -1 +0,0 @@ -{{ json | to_json }}