diff --git a/README.md b/README.md index 9ac1f7e..3ae3c2f 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,13 @@ To install dependancies: Edit the "all" file in ./ansible-fedora/group_vars to customize the setup +In order to easily use ansible, ssh keys are strongly recommended. + +In order to generate an ssh key and add it to the authorized_keys file on your user, run the following commands and follow the prompts. +Passwords are recommended on all ssh keys + + ssh-keygen -t ed25519 + ssh-copy-id -i ~/.ssh/id_ed25519.pub localhost Run the playbook diff --git a/group_vars/all b/group_vars/all index 0ef075c..3459c32 100644 --- a/group_vars/all +++ b/group_vars/all @@ -1,9 +1,8 @@ release_ver: "41" core_ver: "fc41" -username: "" #MY SUDO USER HERE - -dnf_packages: +### List of DNF packages to install +dnf_installs: - rhythmbox - terminator - git @@ -15,11 +14,20 @@ dnf_packages: - flatpak - util-linux-user - curl + - wget - zsh +### List of DNF packages to remove (we remove firefox to avoid duplicates as we install the flatpak) +dnf_removes: + - firefox + + +### Flatpak sources to install flatpak_remotes: - { name: "flathub", url: "https://dl.flathub.org/repo/flathub.flatpakrepo"} + +### Flatpak packages to install flatpaks: - { remote: "flathub", package: "com.discordapp.Discord" } - { remote: "flathub", package: "com.github.tchx84.Flatseal" } diff --git a/roles/dnf/tasks/main.yml b/roles/dnf/tasks/main.yml index 28f94bd..f5fa206 100644 --- a/roles/dnf/tasks/main.yml +++ b/roles/dnf/tasks/main.yml @@ -8,4 +8,10 @@ ansible.builtin.dnf: name: "{{ item }}" state: present - loop: "{{ dnf_packages }}" \ No newline at end of file + loop: "{{ dnf_installs }}" + +- name: Remove Packages + ansible.builtin.dnf: + name: "{{ item }}" + state: absent + loop: "{{ dnf_removes }}" \ No newline at end of file diff --git a/roles/rpmfusion/tasks/main.yml b/roles/rpmfusion/tasks/main.yml index 0a376a9..077a320 100644 --- a/roles/rpmfusion/tasks/main.yml +++ b/roles/rpmfusion/tasks/main.yml @@ -3,6 +3,7 @@ name: - https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-{{ release_ver }}.noarch.rpm - https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-{{ release_ver }}.noarch.rpm + disable_gpg_check: true state: present - name: DNF Update diff --git a/setup.sh b/setup.sh index d48f5a4..1438061 100644 --- a/setup.sh +++ b/setup.sh @@ -2,4 +2,6 @@ echo "Installing ansible, please authenticate with sudo" -sudo dnf install -y ansible \ No newline at end of file +sudo dnf install -y ansible + +echo "Please remember to generate and install ssh keys like shown in the readme, or ansible will fail to authenticate." \ No newline at end of file