From 74b6200e90ad095a5575fc40dd5e45a5aab9493d Mon Sep 17 00:00:00 2001
From: Tommy <contact@tommytran.io>
Date: Fri, 19 Jan 2024 23:44:03 -0700
Subject: [PATCH] Remove USG references

Signed-off-by: Tommy <contact@tommytran.io>
---
 Ubuntu-22.04-Desktop.sh | 9 ---------
 Ubuntu-22.04-Server.sh  | 8 --------
 2 files changed, 17 deletions(-)

diff --git a/Ubuntu-22.04-Desktop.sh b/Ubuntu-22.04-Desktop.sh
index cc04784..5577566 100644
--- a/Ubuntu-22.04-Desktop.sh
+++ b/Ubuntu-22.04-Desktop.sh
@@ -27,22 +27,13 @@ unpriv(){
 #Compliance and updates
 sudo systemctl mask debug-shell.service
 
-#sudo ua enable usg
 sudo apt update -y
 sudo apt full-upgrade -y
-#sudo apt install -y usg
 sudo apt autoremove -y
-#sudo usg fix cis_level2_workstation
 
 # Make home directory private
 sudo chmod 700 /home/*
 
-# Remove AIDE
-#sudo apt purge -y aide*
-
-# Allow su which is disabled by CIS
-sudo sed -i 's/auth required pam_wheel.so use_uid group=sugroup//g' /etc/pam.d/su
-
 # Setting umask to 077
 umask 077
 sudo sed -ie '/^DIR_MODE=/ s/=[0-9]*\+/=0700/' /etc/adduser.conf
diff --git a/Ubuntu-22.04-Server.sh b/Ubuntu-22.04-Server.sh
index 3ab0225..f8c1bbc 100644
--- a/Ubuntu-22.04-Server.sh
+++ b/Ubuntu-22.04-Server.sh
@@ -29,21 +29,13 @@ 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
 
-#USG CIS Server 2 Breaks Unbound right now.
-#sudo ua enable usg
 sudo apt update -y
 sudo apt full-upgrade -y
 sudo apt install -y curl
-#sudo apt install -y usg curl libpam-pwquality
-#sudo apt autoremove -y
-#sudo usg fix cis_level2_server
 
 # Make home directory private
 sudo chmod 700 /home/*
 
-# Remove AIDE
-#sudo apt purge -y aide*
-
 # Setup NTS
 sudo systemctl disable --now systemd-timesyncd
 sudo apt install -y chrony