From a43af5abccc5d5515604512a7f52b58e21422f5d Mon Sep 17 00:00:00 2001 From: Rene Date: Fri, 29 Nov 2024 22:15:25 +0100 Subject: [PATCH] new distro --- local.yml | 8 ++++---- roles/base/tasks/ansible_setup.yml | 2 +- roles/base/tasks/main.yml | 2 +- roles/base/tasks/software/packages_cleanup.yml | 2 +- roles/base/tasks/system_setup/clock.yml | 2 +- roles/base/tasks/system_setup/cron.yml | 2 +- roles/base/vars/linux mint.yml | 1 + roles/docker/tasks/install_docker.yml | 2 +- roles/server/tasks/main.yml | 2 +- roles/server/tasks/utilities/mail_transfer_agent.yml | 2 +- roles/server/tasks/utilities/snmpd.yml | 2 +- roles/webserver/tasks/apps/nextcloud/prereq.yml | 2 +- 12 files changed, 15 insertions(+), 14 deletions(-) create mode 120000 roles/base/vars/linux mint.yml diff --git a/local.yml b/local.yml index f02b6f1..05d1e4b 100644 --- a/local.yml +++ b/local.yml @@ -11,7 +11,7 @@ - name: pre-run | update apt repository (debian, ubuntu, etc.) apt: update_cache=yes changed_when: false - when: ansible_distribution in ["Debian", "Ubuntu"] + when: ansible_distribution in ["Debian", "Ubuntu", "Linux Mint"] - name: pre-run | update pacman repository (arch) pacman: update_cache=yes changed_when: false @@ -27,7 +27,7 @@ - name: pre-run | upgrade system (debian, ubuntu, etc.) apt: upgrade=dist changed_when: false - when: ansible_distribution in ["Debian", "Ubuntu"] + when: ansible_distribution in ["Debian", "Ubuntu", "Linux Mint"] # run roles - hosts: all @@ -135,14 +135,14 @@ apt: autoclean: yes changed_when: false - when: ansible_distribution in ["Debian", "Pop!_OS", "Ubuntu"] + when: ansible_distribution in ["Debian", "Pop!_OS", "Ubuntu", "Linux Mint"] - name: autoremove orphan packages (debian and ubuntu) tags: always apt: autoremove: yes purge: yes - when: ansible_distribution in ["Debian", "Pop!_OS", "Ubuntu"] + when: ansible_distribution in ["Debian", "Pop!_OS", "Ubuntu", "Linux Mint"] # - name: send completion alert # include_tasks: playbooks/send_completion_alert.yml diff --git a/roles/base/tasks/ansible_setup.yml b/roles/base/tasks/ansible_setup.yml index 41d6d53..ea4293f 100644 --- a/roles/base/tasks/ansible_setup.yml +++ b/roles/base/tasks/ansible_setup.yml @@ -16,7 +16,7 @@ tags: ansible,ansible-setup,packages package: name: acl - when: ansible_distribution in ["Debian", "Pop!_OS", "Ubuntu"] + when: ansible_distribution in ["Debian", "Pop!_OS", "Ubuntu", "Linux Mint"] - name: ansible:setup | create ansible log file tags: ansible,ansible-setup diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index a926707..84311f2 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -35,7 +35,7 @@ - import_tasks: system_setup/openssh.yml - import_tasks: system_setup/scripts.yml - import_tasks: software/wazuh-agent.yml - when: ansible_distribution in ["Debian", "Pop!_OS", "Ubuntu"] + when: ansible_distribution in ["Debian", "Pop!_OS", "Ubuntu", "Linux Mint", "Archlinux"] # Set up the ansible environment diff --git a/roles/base/tasks/software/packages_cleanup.yml b/roles/base/tasks/software/packages_cleanup.yml index d81c2c7..b8ebb50 100644 --- a/roles/base/tasks/software/packages_cleanup.yml +++ b/roles/base/tasks/software/packages_cleanup.yml @@ -8,4 +8,4 @@ - exim4-base - exim4-config - nano - when: ansible_distribution in ["Debian", "Pop!_OS", "Ubuntu"] + when: ansible_distribution in ["Debian", "Pop!_OS", "Ubuntu", "Linux Mint"] diff --git a/roles/base/tasks/system_setup/clock.yml b/roles/base/tasks/system_setup/clock.yml index 0b780a3..09b04e9 100644 --- a/roles/base/tasks/system_setup/clock.yml +++ b/roles/base/tasks/system_setup/clock.yml @@ -3,7 +3,7 @@ package: name: systemd-timesyncd state: latest - when: ansible_distribution in ["Pop!_OS", "Ubuntu"] + when: ansible_distribution in ["Pop!_OS", "Ubuntu", "Linux Mint"] - name: system setup | clock | install systemd-timesyncd (debian) tags: ntp, system setup diff --git a/roles/base/tasks/system_setup/cron.yml b/roles/base/tasks/system_setup/cron.yml index b9254ab..cc85cdd 100644 --- a/roles/base/tasks/system_setup/cron.yml +++ b/roles/base/tasks/system_setup/cron.yml @@ -49,7 +49,7 @@ hour: "0" minute: "0" job: "apt list --upgradeable" - when: ansible_distribution in ["Debian", "Ubuntu"] + when: ansible_distribution in ["Debian", "Ubuntu", "Linux Mint"] - name: system setup | cron | Send me a list of upgradeable packages daily (Archlinux) tags: cron diff --git a/roles/base/vars/linux mint.yml b/roles/base/vars/linux mint.yml new file mode 120000 index 0000000..f6b8b83 --- /dev/null +++ b/roles/base/vars/linux mint.yml @@ -0,0 +1 @@ +ubuntu.yml \ No newline at end of file diff --git a/roles/docker/tasks/install_docker.yml b/roles/docker/tasks/install_docker.yml index ce2a809..ccb1c3f 100644 --- a/roles/docker/tasks/install_docker.yml +++ b/roles/docker/tasks/install_docker.yml @@ -14,7 +14,7 @@ file: path: "/tmp/get-docker.sh" # required. Path to the file being managed. state: absent - when: ansible_distribution in ["Debian", "Ubuntu"] + when: ansible_distribution in ["Debian", "Ubuntu", "Linux Mint"] - name: docker | install docker | docker-compose package: diff --git a/roles/server/tasks/main.yml b/roles/server/tasks/main.yml index 30abe5d..9ccaf43 100644 --- a/roles/server/tasks/main.yml +++ b/roles/server/tasks/main.yml @@ -9,7 +9,7 @@ - block: - include_tasks: utilities/mail_transfer_agent.yml - include_tasks: utilities/telegraf.yml - when: ansible_distribution in ["Debian", "Ubuntu"] + when: ansible_distribution in ["Debian", "Ubuntu", "Linux Mint"] - include_tasks: utilities/netdata.yml when: netdata is defined and netdata == true - include_tasks: utilities/snmpd.yml diff --git a/roles/server/tasks/utilities/mail_transfer_agent.yml b/roles/server/tasks/utilities/mail_transfer_agent.yml index 6a878a9..a602145 100644 --- a/roles/server/tasks/utilities/mail_transfer_agent.yml +++ b/roles/server/tasks/utilities/mail_transfer_agent.yml @@ -23,5 +23,5 @@ - { regex: "^root=.*$", line: "root=rene@tantooine.myfirewall.org"} - { regex: "^mailhub=.*", line: "mailhub=mail.universe.local"} - { regex: "^hostname=.*", line: "hostname={{ ansible_fqdn }}"} - when: ansible_distribution in ["Debian", "Pop!_OS", "Ubuntu"] + when: ansible_distribution in ["Debian", "Pop!_OS", "Ubuntu", "Linux Mint"] when: postfix is not defined or postfix == false diff --git a/roles/server/tasks/utilities/snmpd.yml b/roles/server/tasks/utilities/snmpd.yml index 620c29b..e712424 100644 --- a/roles/server/tasks/utilities/snmpd.yml +++ b/roles/server/tasks/utilities/snmpd.yml @@ -13,7 +13,7 @@ group: "root" mode: "0660" validate: "{{ commands.visudo }} -cf %s" - when: ansible_distribution in ["Debian", "Ubuntu"] + when: ansible_distribution in ["Debian", "Ubuntu", "Linux Mint"] - name: server | snmpd | create /etc/snmp file: diff --git a/roles/webserver/tasks/apps/nextcloud/prereq.yml b/roles/webserver/tasks/apps/nextcloud/prereq.yml index b12449e..b2990d9 100644 --- a/roles/webserver/tasks/apps/nextcloud/prereq.yml +++ b/roles/webserver/tasks/apps/nextcloud/prereq.yml @@ -7,7 +7,7 @@ - software-properties-common - lsb-release - ca-certificates - when: ansible_distribution in ["Debian", "Ubuntu"] + when: ansible_distribution in ["Debian", "Ubuntu", "Linux Mint"] - name: webserver | nextcloud | prereq | get php repo key uri: