From 73f93631c290a8e574540257d4d0d96a7faf94ac Mon Sep 17 00:00:00 2001 From: ace Date: Sat, 10 Jun 2023 08:04:09 +0300 Subject: [PATCH] fix --- inventory/ghp/sample/group_vars/all/all.yaml | 2 +- roles/nginx/tasks/configure.yml | 5 +++++ roles/podman/defaults/main.yaml | 2 +- roles/podman/tasks/RedHat.yaml | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/inventory/ghp/sample/group_vars/all/all.yaml b/inventory/ghp/sample/group_vars/all/all.yaml index 47e5904..4da0ac2 100644 --- a/inventory/ghp/sample/group_vars/all/all.yaml +++ b/inventory/ghp/sample/group_vars/all/all.yaml @@ -1,6 +1,6 @@ # Common # namespace: ghp -docker_registry: registry.geekhome.org/ghp +docker_registry: gitea.geekhome.org/ghp domain: example.com mail_domain: "{{ domain }}" local_domain: lan diff --git a/roles/nginx/tasks/configure.yml b/roles/nginx/tasks/configure.yml index 9b7723b..6643e97 100644 --- a/roles/nginx/tasks/configure.yml +++ b/roles/nginx/tasks/configure.yml @@ -15,6 +15,11 @@ notify: reload nginx when: nginx['conf.d'] is defined + - name: create stream.d dir + file: + name: /etc/nginx/stream.d + state: directory + - name: add configs nginx to stream.d copy: content: "{{ item.data }}" diff --git a/roles/podman/defaults/main.yaml b/roles/podman/defaults/main.yaml index 69895ee..89203e3 100644 --- a/roles/podman/defaults/main.yaml +++ b/roles/podman/defaults/main.yaml @@ -1,2 +1,2 @@ --- -podman_version: "{{ '1.6.4' if ansible_facts['distribution_major_version'] == '7' else '4.0.2' if ansible_facts['distribution_major_version'] == '8' }}" +podman_version: "*" diff --git a/roles/podman/tasks/RedHat.yaml b/roles/podman/tasks/RedHat.yaml index e1d9edf..fa6a46a 100644 --- a/roles/podman/tasks/RedHat.yaml +++ b/roles/podman/tasks/RedHat.yaml @@ -1,5 +1,5 @@ --- -- name: Ensure podman {{ podman_version }} installed +- name: Ensure podman installed yum: name: "podman-{{ podman_version }}" state: present