From d8c187b17603c18e542304c4cc8970cdbb999c9f Mon Sep 17 00:00:00 2001 From: Marco Ochse Date: Sat, 23 Mar 2024 19:16:50 +0100 Subject: [PATCH] fix an issue where micro, htop and exa are no longer available for alma and rocky fix an issue for download links for supported linux distros --- README.md | 16 ++++++++-------- install.sh | 2 +- installer/install/tpot.yml | 39 ++++++++++++++++++++++++++++++++++---- 3 files changed, 44 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index aba98c69..bbdfe1e7 100644 --- a/README.md +++ b/README.md @@ -282,14 +282,14 @@ Once you are familiar with how things work you should choose a network you suspe ## Choose your distro Choose a supported distro of your choice. It is recommended to use the minimum / netiso installers linked below and only install a minimalistic set of packages. SSH is mandatory or you will not be able to connect to the machine remotely. -| Distribution Name | x64 | arm64 | -|:-----------------------------------------------|:--------------------------------------------------------------------------------------------------------------------------------------|:----------------------------------------------------------------------------------------------------------------------------------------| -| [Alma Linux](https://almalinux.org) | [download](https://mirrors.almalinux.org/isos/x86_64/9.3.html) | [download](https://mirrors.almalinux.org/isos/aarch64/9.3.html) | -| [Debian](https://www.debian.org/index.en.html) | [download](https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-12.5.0-amd64-netinst.iso) | [download](https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/debian-12.5.0-arm64-netinst.iso) | -| [Fedora](https://fedoraproject.org) | [download](https://download.fedoraproject.org/pub/fedora/linux/releases/39/Server/x86_64/iso/Fedora-Server-netinst-x86_64-39-1.5.iso) | [download](https://download.fedoraproject.org/pub/fedora/linux/releases/39/Server/aarch64/iso/Fedora-Server-netinst-aarch64-39-1.5.iso) | -| [OpenSuse](https://www.opensuse.org) | [download](https://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-NET-x86_64-Current.iso) | [download](https://download.opensuse.org/ports/aarch64/tumbleweed/iso/openSUSE-Tumbleweed-NET-aarch64-Current.iso) | -| [Rocky Linux](https://rockylinux.org) | [download](https://download.rockylinux.org/pub/rocky/9/isos/x86_64/Rocky-9.3-x86_64-minimal.iso) | [download](https://download.rockylinux.org/pub/rocky/9/isos/aarch64/Rocky-9.3-aarch64-minimal.iso) | -| [Ubuntu](https://ubuntu.com) | [download](https://releases.ubuntu.com/22.04.4/ubuntu-22.04.4-live-server-amd64.iso) | [download](https://cdimage.ubuntu.com/releases/22.04/release/ubuntu-22.04.4-live-server-arm64.iso) | +| Distribution Name | x64 | arm64 | +|:--------------------------------------------------------------|:--------------------------------------------------------------------------------------------------------------------------------------|:----------------------------------------------------------------------------------------------------------------------------------------| +| [Alma Linux Boot](https://almalinux.org) | [download](https://repo.almalinux.org/almalinux/9.3/isos/x86_64/AlmaLinux-9.3-x86_64-boot.iso) | [download](https://repo.almalinux.org/almalinux/9.3/isos/aarch64/AlmaLinux-9.3-aarch64-boot.iso) | +| [Debian Netinst](https://www.debian.org/index.en.html) | [download](https://cdimage.debian.org/debian-cd/current/amd64/iso-cd/debian-12.5.0-amd64-netinst.iso) | [download](https://cdimage.debian.org/debian-cd/current/arm64/iso-cd/debian-12.5.0-arm64-netinst.iso) | +| [Fedora Netinst](https://fedoraproject.org) | [download](https://download.fedoraproject.org/pub/fedora/linux/releases/39/Server/x86_64/iso/Fedora-Server-netinst-x86_64-39-1.5.iso) | [download](https://download.fedoraproject.org/pub/fedora/linux/releases/39/Server/aarch64/iso/Fedora-Server-netinst-aarch64-39-1.5.iso) | +| [OpenSuse Tumbleweed Network Image](https://www.opensuse.org) | [download](https://download.opensuse.org/tumbleweed/iso/openSUSE-Tumbleweed-NET-x86_64-Current.iso) | [download](https://download.opensuse.org/ports/aarch64/tumbleweed/iso/openSUSE-Tumbleweed-NET-aarch64-Current.iso) | +| [Rocky Linux Boot](https://rockylinux.org) | [download](https://download.rockylinux.org/pub/rocky/9/isos/x86_64/Rocky-9.3-x86_64-boot.iso) | [download](https://download.rockylinux.org/pub/rocky/9/isos/aarch64/Rocky-9.3-aarch64-boot.iso) | +| [Ubuntu Live Server](https://ubuntu.com) | [download](https://releases.ubuntu.com/22.04.4/ubuntu-22.04.4-live-server-amd64.iso) | [download](https://cdimage.ubuntu.com/releases/22.04/release/ubuntu-22.04.4-live-server-arm64.iso) |
diff --git a/install.sh b/install.sh index 51a3f054..0b2796c7 100755 --- a/install.sh +++ b/install.sh @@ -5,7 +5,7 @@ myUSER=$(whoami) myTPOT_CONF_FILE="/home/${myUSER}/tpotce/.env" myPACKAGES_DEBIAN="ansible apache2-utils cracklib-runtime wget" myPACKAGES_FEDORA="ansible cracklib httpd-tools wget" -myPACKAGES_ROCKY="ansible-core ansible-collection-redhat-rhel_mgmt cracklib httpd-tools wget" +myPACKAGES_ROCKY="ansible-core ansible-collection-redhat-rhel_mgmt epel-release cracklib httpd-tools wget" myPACKAGES_OPENSUSE="ansible apache2-utils cracklib wget" diff --git a/installer/install/tpot.yml b/installer/install/tpot.yml index d7c8f437..1ae6e198 100644 --- a/installer/install/tpot.yml +++ b/installer/install/tpot.yml @@ -155,7 +155,40 @@ - "AlmaLinux" - "Rocky" - - name: Install recommended packages (AlmaLinux, Fedora, Rocky) + - name: Download and install micro editor (AlmaLinux, Rocky) + shell: "curl https://getmic.ro | bash && mv micro /usr/bin" + args: + executable: /bin/bash + register: curl_command + when: ansible_distribution in ["AlmaLinux", "Rocky"] + tags: + - "AlmaLinux" + - "Rocky" + + - name: Install recommended packages (AlmaLinux, Rocky) + package: + name: + - bash-completion + - ca-certificates + - cracklib + - curl + - dnf-plugins-core + - exa + - git + - grc + - htop + - httpd-tools + - net-tools + - vim + - wget + state: latest + update_cache: yes + when: ansible_distribution in ["AlmaLinux", "Rocky"] + tags: + - "AlmaLinux" + - "Rocky" + + - name: Install recommended packages (Fedora) package: name: - bash-completion @@ -174,11 +207,9 @@ - wget state: latest update_cache: yes - when: ansible_distribution in ["AlmaLinux", "Fedora", "Rocky"] + when: ansible_distribution in ["Fedora"] tags: - - "AlmaLinux" - "Fedora" - - "Rocky" - name: Remove conflicting packages (openSUSE Tumbleweed) package: