From 88b264b7e2891677b9026568d4637d0c73a92e3b Mon Sep 17 00:00:00 2001
From: gbaconni <gbaconni@student.42lausanne.ch>
Date: Tue, 9 Nov 2021 09:20:10 +0100
Subject: [PATCH] 2021-11-09 09:20:10

---
 bonus.sh     |  2 +-
 bootstrap.sh | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bonus.sh b/bonus.sh
index 3825976..0275b25 100755
--- a/bonus.sh
+++ b/bonus.sh
@@ -6,7 +6,7 @@
 #    By: gbaconni@student.42lausanne.ch             +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2021/11/07 14:23:18 by gbaconni          #+#    #+#              #
-#    Updated: 2021/11/09 08:30:31 by gbaconni         ###   lausanne.ch        #
+#    Updated: 2021/11/09 09:18:25 by gbaconni         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
diff --git a/bootstrap.sh b/bootstrap.sh
index 3601d8d..34abf38 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -6,7 +6,7 @@
 #    By: gbaconni@student.42lausanne.ch             +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2021/11/04 10:58:16 by gbaconni          #+#    #+#              #
-#    Updated: 2021/11/09 09:07:26 by gbaconni         ###   ########.fr        #
+#    Updated: 2021/11/09 09:18:02 by gbaconni         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -15,7 +15,7 @@ PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 ft_apt ()
 {
 	user=${1-marvin}
-	sed -i'.orig' -r 's/^(deb cdrom)/#\1/' /etc/apt/sources.list
+	sed -i $(date '+_%Y%m%d%H%M%S') -r 's/^(deb cdrom)/#\1/' /etc/apt/sources.list
 	apt-get update >/dev/null 2>&1
 	apt-get clean
 	return 0
@@ -34,7 +34,7 @@ ft_ssh ()
 	user=${1-marvin}
 	port=${2-4242}
 	home=$(eval echo ~${user})
-	sed -i'.orig' -r 's/^#?(Port) .*/\1 '${port}'/; s/^#?(PermitRootLogin) .*/\1 no/;' /etc/ssh/sshd_config
+	sed -i $(date '+_%Y%m%d%H%M%S') -r 's/^#?(Port) .*/\1 '${port}'/; s/^#?(PermitRootLogin) .*/\1 no/;' /etc/ssh/sshd_config
 	install -D -d -o ${user} -g ${user} -m 0700 ${home}/.ssh
 	install -o ${user} -g ${user} -m 0600 /dev/null ${home}/.ssh/authorized_keys
 	echo 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC1Ol5Sfn9XTleGg6PDSRu9+Bs/V+dWmY+EeIQuE/3XH4XxQjguip0e7lLvP1emmnHYrRzD913MbTpYIEidcxQdk/1bauYcMoW01Sx5nG1I+pkdgnQP4p06995/2hM1GPuY7WSDKOMydu1zuJ/7N9TlzItGwV5bivc7tjISdep/rhugFI5ApfcdhEyst+M8T40+s7CRkgnatqx+s8xmzvRIFf4jf/u76FegxYqC5tV30AkUIF/CTpCcENRiQkCTIpwkt55Y0Rk0YnWhM1D1HDyNQizmud38R5B9spfKZH6sOhuzUtRNKE1jVdAdl7fEaCT4Y7kYW2HF7sa7uy+IlNRbebDg5HHfy91c2pyUkl65QQOWfqLm0P3J9i5xywmRenVrLxe8P9Cs00CJGdfXaaE2f/5K7nkphVIXE8nCqye2I50ifNYktWdcWQdD4nJpDzFAZllJqSKobdGOn9qW9h8dPrTTB3dTRroRTXoIZRHCKRE8lL+jVTKLlMcMyLUgAXrsJ0ehmuskaDdQc9Mm9i7/2J84RLfs64zsLkC5xqhBaw4Er4GuZ3r1LHS09iqKCQ1T52wJ9ZTHjVd6auikevWf3beLj5NQy25b1bAoWFmfg3fhsg7pbcyqHeSSPuCoXfuaqA5+Fz4ARTdXSodmriqCmM6YUzWMUX1+VZIXaVr5bw== '${user} > ${home}/.ssh/authorized_keys
@@ -53,8 +53,8 @@ ft_groups ()
 ft_policy ()
 {
 	user=${1-marvin}
-	sed -i'.orig' -r 's/^#?(PASS_MAX_DAYS).*/\1\t30/; s/^#?(PASS_MIN_DAYS).*/\1\t2/; s/^#?(PASS_WARN_AGE).*/\1\t7/; s/^#?(PASS_MIN_LEN).*/\1\t10/;' /etc/login.defs
-	sed -i'.orig' -r 's/^[# ]*(minlen =).*/\1 10/; s/^[# ]*([ud]credit =).*/\1 -1/; s/^[# ]*(maxrepeat =).*/\1 3/; s/^[# ]*(usercheck =).*/\1 1/; s/^[# ]*(enforcing =).*/\1 1/; s/^[# ]*(difok =).*/\1 7/; s/^[# ]*(enforce_for_root)/\1/; s/^[# ]*(local_users_only)/\1/;' /etc/security/pwquality.conf
+	sed -i $(date '+_%Y%m%d%H%M%S') -r 's/^#?(PASS_MAX_DAYS).*/\1\t30/; s/^#?(PASS_MIN_DAYS).*/\1\t2/; s/^#?(PASS_WARN_AGE).*/\1\t7/; s/^#?(PASS_MIN_LEN).*/\1\t10/;' /etc/login.defs
+	sed -i $(date '+_%Y%m%d%H%M%S') -r 's/^[# ]*(minlen =).*/\1 10/; s/^[# ]*([ud]credit =).*/\1 -1/; s/^[# ]*(maxrepeat =).*/\1 3/; s/^[# ]*(usercheck =).*/\1 1/; s/^[# ]*(enforcing =).*/\1 1/; s/^[# ]*(difok =).*/\1 7/; s/^[# ]*(enforce_for_root)/\1/; s/^[# ]*(local_users_only)/\1/;' /etc/security/pwquality.conf
 	chage -M 30 -m 2 -W 7 ${user}
 	chage -M 30 -m 2 -W 7 root
 	echo -e "Born2beWild\nBorn2beWild" | passwd -q ${user} >/dev/null 2>&1