From 9be17e982b6973960991b897e1854e58e0ccdca9 Mon Sep 17 00:00:00 2001 From: t3chn0m4g3 Date: Sun, 25 Jun 2023 16:56:18 +0200 Subject: [PATCH] ansible tweaking, finalize suse --- installer/ansible/{ => install}/sudo.yml | 0 installer/ansible/{ => install}/tpot.yml | 25 +++++++++---------- .../ansible/{sudo_del.yml => remove/sudo.yml} | 0 3 files changed, 12 insertions(+), 13 deletions(-) rename installer/ansible/{ => install}/sudo.yml (100%) rename installer/ansible/{ => install}/tpot.yml (99%) rename installer/ansible/{sudo_del.yml => remove/sudo.yml} (100%) diff --git a/installer/ansible/sudo.yml b/installer/ansible/install/sudo.yml similarity index 100% rename from installer/ansible/sudo.yml rename to installer/ansible/install/sudo.yml diff --git a/installer/ansible/tpot.yml b/installer/ansible/install/tpot.yml similarity index 99% rename from installer/ansible/tpot.yml rename to installer/ansible/install/tpot.yml index 2847c06a..5e631d5c 100644 --- a/installer/ansible/tpot.yml +++ b/installer/ansible/install/tpot.yml @@ -62,6 +62,18 @@ update_cache: yes when: ansible_distribution in ["Fedora"] + - name: Remove conflicting packages (openSUSE Tumbleweed) + package: + name: + - cups + - net-tools + - postfix + - yast2-auth-client + - yast2-auth-user + state: absent + update_cache: yes + when: ansible_distribution in ["openSUSE Tumbleweed"] + - name: Install recommended packages (openSUSE Tumbleweed) package: name: @@ -76,18 +88,6 @@ update_cache: yes when: ansible_distribution in ["openSUSE Tumbleweed"] - - name: Remove conflicting packages (openSUSE Tumbleweed) - package: - name: - - cups - - net-tools - - postfix - - yast2-auth-client - - yast2-auth-user - state: absent - when: ansible_distribution in ["openSUSE Tumbleweed"] - - ################################################# # T-Pot - Prepare for and install Docker Engine # ################################################# @@ -153,7 +153,6 @@ - docker-compose state: latest update_cache: yes - notify: Restart Docker when: ansible_distribution in ["openSUSE Tumbleweed"] - name: Install Docker Engine packages (Debian, Fedora, Ubuntu) diff --git a/installer/ansible/sudo_del.yml b/installer/ansible/remove/sudo.yml similarity index 100% rename from installer/ansible/sudo_del.yml rename to installer/ansible/remove/sudo.yml