From ef2e0e4919f97285f5281204a792b869301c1681 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20K=C3=B6rber?= Date: Tue, 9 Feb 2021 21:00:57 +0100 Subject: [PATCH] Deprecate fedora --- install.sh | 4 +- packages.yml | 137 +-------------------------------------------------- playbook.yml | 46 +---------------- user.yml | 10 ---- 4 files changed, 3 insertions(+), 194 deletions(-) diff --git a/install.sh b/install.sh index 66c0a67..0f869e8 100755 --- a/install.sh +++ b/install.sh @@ -47,9 +47,7 @@ sudowrap() { _install() { _package="$1" ; shift - if [[ $NAME == "Fedora" ]] ; then - sudowrap dnf install --assumeyes "${_package}" - elif [[ $NAME == "Ubuntu" ]] ; then + if [[ $NAME == "Ubuntu" ]] ; then sudowrap apt-get install --assume-yes "${_package}" elif [[ $NAME == "Arch Linux" ]] ; then sudowrap pacman -S --noconfirm "${_package}" diff --git a/packages.yml b/packages.yml index 23b3c27..0300a24 100644 --- a/packages.yml +++ b/packages.yml @@ -1,16 +1,6 @@ packages: list: build-essentials: - fedora: - - autoconf - - automake - - gcc-c++ - - gcc - - ctags - - cmake - - libtool - - elfutils-libelf-devel - - maven ubuntu: - build-essential - exuberant-ctags @@ -21,35 +11,24 @@ packages: - maven - base-devel golang: - fedora: ["golang", "glibc-static"] ubuntu: ["golang-go"] archlinux: ["go"] make: - fedora: ["make"] ubuntu: ["make"] archlinux: ["make"] gdb: - fedora: ["gdb"] ubuntu: ["gdb"] archlinux: ["gdb"] strace: - fedora: ["strace"] ubuntu: ["strace"] archlinux: ["strace"] sudo: - fedora: ["sudo"] ubuntu: ["sudo"] archlinux: ["sudo"] apt: - fedora: [] ubuntu: ["apt-file"] - archlinux: [] + archlinux: [""] xorg: - fedora: - - '@base-x' - - xorg-x11-drv-synaptics-legacy - - xorg-x11-drv-libinput - - libinput ubuntu: [] archlinux: - xorg-server @@ -61,461 +40,347 @@ packages: - xorg-xset - xorg-xinit dmenu: - fedora: ["dmenu"] ubuntu: ["dmenu"] archlinux: ["dmenu"] ansible: - fedora: ["ansible"] ubuntu: ["ansible"] archlinux: ["ansible"] xdotool: - fedora: ["xdotool"] ubuntu: ["xdotool"] archlinux: ["xdotool"] arandr: - fedora: ["arandr"] ubuntu: ["arandr"] archlinux: ["arandr"] borgbackup: - fedora: ["borgbackup"] ubuntu: ["borgbackup"] archlinux: ["borgbackup"] docker: - fedora: ["docker"] ubuntu: ["docker.io"] archlinux: ["docker", "docker-compose"] font-awesome: - fedora: ["fontawesome-fonts", "fontawesome-fonts-web"] ubuntu: ["fonts-font-awesome"] archlinux: ["ttf-font-awesome"] font-inconsolata: - fedora: ["levien-inconsolata-fonts"] ubuntu: ["fonts-inconsolata"] archlinux: ["ttf-inconsolata"] font-dejavu: - fedora: [] ubuntu: [] archlinux: ["ttf-dejavu"] font-libertine: - fedora: [] ubuntu: [] archlinux: ["ttf-linux-libertine"] font-emoji: - fedora: [] ubuntu: [] archlinux: ["noto-fonts-emoji"] git: - fedora: ["git", "gitk"] ubuntu: ["git", "git-extras", "gitk", "git-email"] # tk required for gitk archlinux: ["git", "tk"] htop: - fedora: ["htop"] ubuntu: ["htop"] archlinux: ["htop"] feh: - fedora: ["feh"] ubuntu: ["feh"] archlinux: ["feh"] i3: - fedora: ["i3"] ubuntu: ["i3"] archlinux: ["i3-wm"] i3lock: - fedora: ["i3lock"] ubuntu: ["i3lock"] archlinux: ["i3lock"] pluma: - fedora: ["pluma"] ubuntu: ["pluma"] archlinux: ["pluma"] vim: - fedora: ["vim-enhanced"] ubuntu: ["vim"] archlinux: ["gvim"] neovim: - fedora: ["neovim", "python3-neovim"] ubuntu: ["neovim"] archlinux: ["neovim", "python-pynvim"] network-manager-applet: - fedora: ["network-manager-applet"] ubuntu: [] archlinux: ["network-manager-applet"] pasystray: - fedora: ["pasystray"] ubuntu: ["pasystray"] archlinux: ["pasystray"] redshift: - fedora: ["redshift-gtk"] ubuntu: ["redshift-gtk"] archlinux: ["redshift"] pavucontrol: - fedora: ["pavucontrol"] ubuntu: ["pavucontrol"] archlinux: ["pavucontrol-qt"] pinentry-qt: - fedora: ["pinentry", "pinentry-curses", "pinentry-qt"] ubuntu: ["pinentry-curses", "pinentry-qt"] archlinux: ["pinentry"] pinta: - fedora: ["pinta"] ubuntu: ["pinta"] archlinux: ["pinta"] py3status: - fedora: ["py3status", "python3-pytz", "python3-tzlocal"] ubuntu: ["py3status", "python3-arrow", "python3-tzlocal", "python3-pydbus"] archlinux: ["py3status", "python-pytz", "python-tzlocal", "python-dbus", "python-pydbus"] pass: - fedora: ["pass"] ubuntu: ["pass"] archlinux: ["pass", "passff-host"] keepassx: - fedora: ["keepassx"] ubuntu: ["keepassx"] archlinux: [] urxvt: - fedora: ["rxvt-unicode-256color"] ubuntu: ["rxvt-unicode-256color"] archlinux: ["rxvt-unicode"] alacritty: - fedora: [] ubuntu: [] archlinux: ["alacritty"] tmux: - fedora: ["tmux"] ubuntu: ["tmux"] archlinux: ["tmux"] screen: - fedora: ["screen"] ubuntu: ["screen"] archlinux: ["screen"] zsh: - fedora: ["zsh", "zsh-syntax-highlighting"] ubuntu: ["zsh", "zsh-syntax-highlighting"] archlinux: ["zsh", "zsh-syntax-highlighting", "zsh-autosuggestions", "zsh-completions"] zathura: - fedora: ["zathura-pdf-mupdf"] ubuntu: ["zathura", "zathura-pdf-poppler"] archlinux: ["zathura", "zathura-pdf-poppler"] pdf: - fedora: [] ubuntu: [] archlinux: ["ghostscript", "enscript"] pandoc: - fedora: ["pandoc"] ubuntu: ["pandoc"] archlinux: ["pandoc", "texlive-core", "texlive-fontsextra", "texlive-latexextra"] libvirt: - fedora: ["virt-manager", "libvirt-client"] ubuntu: ["virt-manager", "libvirt-bin"] archlinux: ["virt-manager", "libvirt"] firefox: - fedora: ["firefox"] ubuntu: ["firefox"] archlinux: ["firefox"] ranger: - fedora: ["ranger"] ubuntu: ["ranger"] archlinux: ["ranger"] thunar: - fedora: ["thunar"] ubuntu: ["thunar"] archlinux: ["thunar"] unclutter: - fedora: ["unclutter"] ubuntu: ["unclutter"] archlinux: ["unclutter"] chromium: - fedora: ["chromium"] ubuntu: ["chromium-browser"] archlinux: ["chromium"] libreoffice: - fedora: ["libreoffice", "libreoffice-langpack-de", "libreoffice-langpack-en"] ubuntu: ["libreoffice"] archlinux: ["libreoffice-fresh", "libreoffice-fresh-de"] qt-theming: - fedora: ["breeze-cursor-theme", "breeze-icon-theme"] ubuntu: ["breeze-cursor-theme", "breeze-icon-theme", "breeze", "qt5ct"] archlinux: ["breeze", "breeze-icons", "breeze-grub", "qt5ct"] gtk-theming: - fedora: ["breeze-gtk"] ubuntu: ["gtk3-engines-breeze", "lxappearance"] archlinux: ["breeze-gtk", "lxappearance"] xcompmgr: - fedora: ["xcompmgr"] ubuntu: ["xcompmgr"] archlinux: ["xcompmgr"] python: - fedora: ["python", "python3-devel"] ubuntu: ["python3", "python3-pip", "python3-venv", "virtualenv", "pylint3"] archlinux: ["python3"] xbacklight: - fedora: ["xbacklight"] ubuntu: ["xbacklight"] archlinux: ["xorg-xbacklight"] wireshark: - fedora: ["wireshark"] ubuntu: ["wireshark", "wireshark-qt"] archlinux: ["wireshark-cli", "wireshark-qt"] dia: - fedora: ["dia"] ubuntu: ["dia"] archlinux: ["dia"] shutter: - fedora: ["shutter"] ubuntu: ["shutter"] archlinux: [] nmap: - fedora: ["nmap"] ubuntu: ["nmap"] archlinux: ["nmap"] openvpn: - fedora: ["openvpn"] ubuntu: ["openvpn"] archlinux: ["openvpn"] curl: - fedora: ["curl"] ubuntu: ["curl"] archlinux: ["curl"] wget: - fedora: ["wget"] ubuntu: ["wget"] archlinux: ["wget"] tree: - fedora: ["tree"] ubuntu: ["tree"] archlinux: ["tree"] which: - fedora: ["which"] ubuntu: [] archlinux: ["which"] zip: - fedora: ["zip"] ubuntu: ["zip", "unzip"] archlinux: ["zip", "unzip"] traceroute: - fedora: ["traceroute"] ubuntu: ["traceroute"] archlinux: ["traceroute"] tcpdump: - fedora: ["tcpdump"] ubuntu: ["tcpdump"] archlinux: ["tcpdump"] tar: - fedora: ["tar"] ubuntu: ["tar"] archlinux: ["tar"] rsync: - fedora: ["rsync"] ubuntu: ["rsync"] archlinux: ["rsync"] net-tools: - fedora: ["net-tools"] ubuntu: ["net-tools"] archlinux: ["net-tools"] ntfs: - fedora: ["ntfs-3g", "ntfsprogs"] ubuntu: ["ntfs-3g"] archlinux: ["ntfs-3g"] lsof: - fedora: ["lsof"] ubuntu: ["lsof"] archlinux: ["lsof"] iptables: - fedora: ["iptables"] ubuntu: ["iptables"] archlinux: ["iptables"] pwgen: - fedora: ["pwgen"] ubuntu: ["pwgen"] archlinux: ["pwgen"] gpg: - fedora: ["gnupg2", "paperkey", "yubikey-manager"] ubuntu: ["gnupg2"] archlinux: ["gnupg", "paperkey", "yubikey-manager", "yubikey-touch-detector"] networkmanager: - fedora: ["NetworkManager", "NetworkManager-wifi"] ubuntu: ["network-manager", "network-manager-openvpn", "network-manager-openconnect"] archlinux: ["networkmanager"] pulseaudio: - fedora: ["pulseaudio", "pulseaudio-utils"] ubuntu: ["pulseaudio", "pulseaudio-utils"] archlinux: ["pulseaudio", "pulseaudio-alsa"] iw: - fedora: ["iw"] ubuntu: ["iw"] archlinux: ["iw"] cowsay: - fedora: ["cowsay"] ubuntu: ["cowsay"] archlinux: ["cowsay"] ruby: - fedora: ["ruby", "ruby-devel", "rubygem-bundler"] ubuntu: ["ruby", "ruby-dev", "ruby-bundler"] archlinux: ["ruby"] lxc: - fedora: ["lxc"] ubuntu: ["lxc"] archlinux: ["lxc"] acpi: - fedora: ["acpi"] ubuntu: ["acpid"] archlinux: ["acpi", "acpid"] npm: - fedora: ["npm"] ubuntu: ["npm"] archlinux: ["npm"] xdg: - fedora: ["xdg-utils"] ubuntu: ["xdg-utils"] archlinux: ["xdg-utils"] docs: - fedora: ["man-pages"] ubuntu: ["manpages"] archlinux: ["man-pages"] compton: - fedora: ["compton"] ubuntu: ["compton"] archlinux: [] dunst: - fedora: ["dunst"] ubuntu: ["dunst"] archlinux: ["dunst"] cloc: - fedora: ["cloc"] ubuntu: ["cloc"] archlinux: ["cloc"] bluetooth: - fedora: [] ubuntu: ["blueman"] archlinux: ["bluez", "bluez-tools", "blueman"] autorandr: - fedora: [] ubuntu: ["autorandr"] archlinux: ["autorandr"] bwm-ng: - fedora: [] ubuntu: ["bwm-ng"] archlinux: ["bwm-ng"] virtualbox: - fedora: [] ubuntu: ["virtualbox"] archlinux: [] ssh: - fedora: [] ubuntu: [] archlinux: ["openssh"] sshfs: - fedora: [] ubuntu: ["sshfs"] archlinux: ["sshfs"] expect: - fedora: [] ubuntu: ["expect"] archlinux: ["expect"] inotify: - fedora: [] ubuntu: ["inotify-tools"] archlinux: ["inotify-tools"] rclone: - fedora: ["rclone"] ubuntu: ["rclone"] archlinux: ["rclone"] dnf: - fedora: ["python3-dnf"] ubuntu: [] archlinux: [] rust: - fedora: [] ubuntu: ["rustc", "cargo"] archlinux: ["rust"] musescore: - fedora: [] ubuntu: ["musescore"] archlinux: ["musescore"] sipcalc: - fedora: [] ubuntu: ["sipcalc"] archlinux: ["sipcalc"] rofi: - fedora: [] ubuntu: ["rofi"] archlinux: ["rofi"] anki: - fedora: ["anki"] ubuntu: ["anki"] archlinux: ["anki"] imv: - fedora: [] ubuntu: [] archlinux: ["imv"] pacman: - fedora: [] ubuntu: [] archlinux: ["pacman", "pacman-contrib"] steam: - fedora: [] ubuntu: [] archlinux: ["steam"] man: - fedora: [] ubuntu: [] archlinux: ["man-db", "man-pages"] discord: - fedora: [] ubuntu: [] archlinux: ["discord"] nextcloud: - fedora: [] ubuntu: [] archlinux: ["nextcloud-client"] kwallet: - fedora: [] ubuntu: [] archlinux: ["kwallet", "kwalletmanager"] wallpapers: - fedora: [] ubuntu: [] archlinux: ["elementary-wallpapers", "deepin-community-wallpapers"] wallutils: - fedora: [] ubuntu: [] archlinux: ["wallutils"] pv: - fedora: ["pv"] ubuntu: ["pv"] archlinux: ["pv"] stress: - fedora: [] ubuntu: [] archlinux: ["stress"] mpris: - fedora: [] ubuntu: ["stress"] archlinux: ["playerctl"] imagemagick: - fedora: [] ubuntu: ["imagemagick"] archlinux: ["imagemagick"] mpv: - fedora: [] ubuntu: ["mpv"] archlinux: ["mpv"] gnome-keyring: - fedora: [] ubuntu: ["gnome-keyring"] archlinux: ["gnome-keyring"] element: - fedora: [] ubuntu: [] archlinux: ["element-desktop"] maim: - fedora: [] ubuntu: [] archlinux: ["maim"] remove: mousepad: - fedora: ["mousepad"] ubuntu: ["mousepad"] archlinux: ["mousepad"] diff --git a/playbook.yml b/playbook.yml index e77b9c1..9fbeda5 100644 --- a/playbook.yml +++ b/playbook.yml @@ -17,7 +17,7 @@ - name: Check for valid distro assert: - that: distro in ('fedora', 'ubuntu', 'archlinux') + that: distro in ('ubuntu', 'archlinux') - block: - block: @@ -43,26 +43,6 @@ become: true when: distro == 'ubuntu' - - block: - - name: Update dnf cache - dnf: - update_cache: true - become: true - - - name: Upgrade system - dnf: - name: '*' - state: latest - update_cache: false - become: true - - - name: Remove unused packages - dnf: - autoremove: true - update_cache: false - become: true - when: distro == 'fedora' - - block: - name: enable multilib repository blockinfile: @@ -93,15 +73,6 @@ when: distro == 'archlinux' tags: [update_system] - - name: install selinux specials on fedora - dnf: - state: installed - name: - - python3-libselinux - - policycoreutils-python-utils - become: true - when: distro == 'fedora' - - block: - name: install sudo package: @@ -259,11 +230,6 @@ - rebuild initrd when: distro == 'archlinux' - - set_fact: - disable_services: - - sshd - when: distro == 'fedora' - - set_fact: disable_services: - ssh @@ -283,16 +249,6 @@ become: true when: manage_services|default(true)|bool - - set_fact: - enable_services: - - NetworkManager - # does not work with fedora 31 due to the switch to cgroups v2: - # https://github.com/docker/cli/issues/2104 - # https://bugzilla.redhat.com/show_bug.cgi?id=1746355#c1 - # - docker - - libvirtd - when: distro == 'fedora' - - set_fact: enable_services: - NetworkManager diff --git a/user.yml b/user.yml index 4eb8904..d772f3c 100644 --- a/user.yml +++ b/user.yml @@ -27,16 +27,6 @@ when: distro == 'ubuntu' tags: [always] -- set_fact: - user_groups: - - libvirt - - wheel - - vboxusers - - wireshark - - docker - when: distro == 'fedora' - tags: [always] - - set_fact: user_groups: - libvirt