From 3d1ece98619428741a05983f6db0d0c1785db366 Mon Sep 17 00:00:00 2001 From: Tommy Date: Fri, 17 May 2024 02:49:31 -0700 Subject: [PATCH] Consistency fix Signed-off-by: Tommy --- Fedora-Server-40.sh | 6 +++--- Fedora-Workstation-40.sh | 6 +++--- Ubuntu-23.10-Desktop.sh | 24 +++++++++++------------- Ubuntu-24.04-Server.sh | 24 ++++++++++++------------ 4 files changed, 29 insertions(+), 31 deletions(-) diff --git a/Fedora-Server-40.sh b/Fedora-Server-40.sh index 0e4c436..50e9d1e 100644 --- a/Fedora-Server-40.sh +++ b/Fedora-Server-40.sh @@ -88,13 +88,13 @@ unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/m unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/main/etc/dnf/dnf.conf | sudo tee /etc/dnf/dnf.conf sudo sed -i 's/^metalink=.*/&\&protocol=https/g' /etc/yum.repos.d/* -# Enable auto TRIM -sudo systemctl enable fstrim.timer - # Setup fwupd echo 'UriSchemes=file;https' | sudo tee -a /etc/fwupd/fwupd.conf sudo systemctl restart fwupd +# Enable auto TRIM +sudo systemctl enable fstrim.timer + ### Differentiating bare metal and virtual installs # Installing tuned first here because virt-what is 1 of its dependencies anyways diff --git a/Fedora-Workstation-40.sh b/Fedora-Workstation-40.sh index 78c6d24..967232f 100644 --- a/Fedora-Workstation-40.sh +++ b/Fedora-Workstation-40.sh @@ -207,13 +207,13 @@ gpgkey=https://packages.microsoft.com/keys/microsoft.asc' | sudo tee /etc/yum.re umask 077 fi -# Enable auto TRIM -sudo systemctl enable fstrim.timer - # Setup fwupd echo 'UriSchemes=file;https' | sudo tee -a /etc/fwupd/fwupd.conf sudo systemctl restart fwupd +# Enable auto TRIM +sudo systemctl enable fstrim.timer + ### Differentiating bare metal and virtual installs # Installing tuned first here because virt-what is 1 of its dependencies anyways diff --git a/Ubuntu-23.10-Desktop.sh b/Ubuntu-23.10-Desktop.sh index 1f6fd64..546244d 100644 --- a/Ubuntu-23.10-Desktop.sh +++ b/Ubuntu-23.10-Desktop.sh @@ -44,24 +44,12 @@ install_options # Compliance and updates sudo systemctl mask debug-shell.service -## Avoid phased updates -sudo apt install curl -y -unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/main/etc/apt/apt.conf.d/99sane-upgrades | sudo tee /etc/apt/apt.conf.d/99sane-upgrades -sudo chmod 644 /etc/apt/apt.conf.d/99sane-upgrades - -sudo apt update -y -sudo apt full-upgrade -y -sudo apt autoremove -y - # Make home directory private sudo chmod 700 /home/* # Setting umask to 077 umask 077 -sudo sed -ie '/^DIR_MODE=/ s/=[0-9]*\+/=0700/' /etc/adduser.conf -sudo sed -ie '/^UMASK\s\+/ s/022/077/' /etc/login.defs -sudo sed -i 's/USERGROUPS_ENAB yes/USERGROUPS_ENAB no/g' /etc/login.defs -echo 'umask 077' | sudo tee --append /etc/profile +echo 'umask 077' | sudo tee -a /etc/bash.bashrc # Setup NTS sudo systemctl disable --now systemd-timesyncd @@ -145,6 +133,16 @@ sudo fwupdmgr refresh --force sudo fwupdmgr get-updates -y sudo fwupdmgr update -y +## Avoid phased updates +sudo apt install curl -y +unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/main/etc/apt/apt.conf.d/99sane-upgrades | sudo tee /etc/apt/apt.conf.d/99sane-upgrades +sudo chmod 644 /etc/apt/apt.conf.d/99sane-upgrades + +# Update system +sudo apt update -y +sudo apt full-upgrade -y +sudo apt autoremove -y + # Remove unneeded packages sudo apt purge -y apport baobab cups* eog gedit firefox* gnome-calculator gnome-characters* gnome-clocks gnome-font-viewer gnome-logs gnome-power-manager gnome-shell-extension-prefs gnome-text-editor libreoffice* seahorse tcpdump whoopsie sudo apt autoremove -y diff --git a/Ubuntu-24.04-Server.sh b/Ubuntu-24.04-Server.sh index 3fa83e9..b470bcb 100644 --- a/Ubuntu-24.04-Server.sh +++ b/Ubuntu-24.04-Server.sh @@ -29,18 +29,6 @@ sudo systemctl mask debug-shell.service echo 'Authorized uses only. All activity may be monitored and reported.' | sudo tee /etc/issue echo 'Authorized uses only. All activity may be monitored and reported.' | sudo tee /etc/issue.net -## Avoid phased updates -sudo apt install -y curl -unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/main/etc/apt/apt.conf.d/99sane-upgrades | sudo tee /etc/apt/apt.conf.d/99sane-upgrades -sudo chmod 644 /etc/apt/apt.conf.d/99sane-upgrades - -sudo apt update -y -sudo apt full-upgrade -y -sudo apt autoremove -y - -## Install basic sysadmin tools -sudo apt install nano iputils-ping - # Make home directory private sudo chmod 700 /home/* @@ -91,6 +79,18 @@ fi sudo systemctl disable --now apport.service sudo systemctl mask apport.service +## Avoid phased updates +sudo apt install -y curl +unpriv curl https://raw.githubusercontent.com/TommyTran732/Linux-Setup-Scripts/main/etc/apt/apt.conf.d/99sane-upgrades | sudo tee /etc/apt/apt.conf.d/99sane-upgrades +sudo chmod 644 /etc/apt/apt.conf.d/99sane-upgrades + +sudo apt update -y +sudo apt full-upgrade -y +sudo apt autoremove -y + +## Install basic sysadmin tools +sudo apt install nano iputils-ping + #Setup fwupd sudo apt install fwupd -y mkdir -p /etc/systemd/system/fwupd-refresh.service.d