From a5aecd0b462eda38cad01231754d396f8291820e Mon Sep 17 00:00:00 2001 From: Wojciech Kozlowski Date: Sat, 29 Jul 2023 15:19:20 +0200 Subject: [PATCH] Add IPv6 for music upload --- playbooks/music.yml | 3 ++- playbooks/roles/music/org/meta/argument_specs.yml | 5 ++++- playbooks/roles/music/org/tasks/main.yml | 10 ++++++++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/playbooks/music.yml b/playbooks/music.yml index d24a1e8..4774c26 100644 --- a/playbooks/music.yml +++ b/playbooks/music.yml @@ -49,4 +49,5 @@ - role: "music/org" tags: "music:org" vars: - music_org_nextcloud_ip_address: "{{ services_all_services.lrproxy.address }}" + music_org_nextcloud_inet_address: "{{ services_all_services.lrproxy.inet_address }}" + music_org_nextcloud_inet6_address: "{{ services_all_services.lrproxy.inet6_address }}" diff --git a/playbooks/roles/music/org/meta/argument_specs.yml b/playbooks/roles/music/org/meta/argument_specs.yml index 828a35a..0b8688b 100644 --- a/playbooks/roles/music/org/meta/argument_specs.yml +++ b/playbooks/roles/music/org/meta/argument_specs.yml @@ -17,7 +17,10 @@ argument_specs: music_user_nextcloud_domain: type: "str" required: true - music_org_nextcloud_ip_address: + music_org_nextcloud_inet_address: + type: "str" + required: true + music_org_nextcloud_inet6_address: type: "str" required: true music_user_nextcloud_url: diff --git a/playbooks/roles/music/org/tasks/main.yml b/playbooks/roles/music/org/tasks/main.yml index 32886b3..80d7a31 100644 --- a/playbooks/roles/music/org/tasks/main.yml +++ b/playbooks/roles/music/org/tasks/main.yml @@ -13,10 +13,16 @@ dest: "/usr/local/bin/nextcloud-upload" mode: 0755 -- name: "resolve nextcloud-upload via hosts file" +- name: "resolve nextcloud-upload via hosts file (inet)" ansible.builtin.lineinfile: path: "/etc/hosts" - line: "{{ music_org_nextcloud_ip_address }} {{ music_user_nextcloud_domain }}" + line: "{{ music_org_nextcloud_inet_address }} {{ music_user_nextcloud_domain }}" + insertafter: "EOF" + +- name: "resolve nextcloud-upload via hosts file (inet6)" + ansible.builtin.lineinfile: + path: "/etc/hosts" + line: "{{ music_org_nextcloud_inet6_address }} {{ music_user_nextcloud_domain }}" insertafter: "EOF" - block: