From ec6766d8c7b4024f70523dcf39ee048c33e7efb8 Mon Sep 17 00:00:00 2001
From: bms8197 <bogdan@898.ro>
Date: Sat, 5 Mar 2022 22:40:26 +0200
Subject: [PATCH] saving uncommitted changes in /etc prior to dnf run

---
 csf/changelog.txt    | 21 +++++++++++++++++++++
 csf/version.txt      |  2 +-
 group-               |  5 +++--
 gshadow-             |  5 +++--
 logrotate.d/fail2ban |  3 +++
 logrotate.d/nginx    |  3 ++-
 passwd-              |  2 ++
 shadow-              |  4 +++-
 subgid-              |  2 ++
 subuid-              |  2 ++
 10 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/csf/changelog.txt b/csf/changelog.txt
index ad4688a..458e999 100644
--- a/csf/changelog.txt
+++ b/csf/changelog.txt
@@ -1,5 +1,26 @@
 ChangeLog:
 
+14.16 - Removed some spurious debug code
+
+        Modified alert templates for: 
+	  LF_WEBMIN_EMAIL_ALERT
+	  LF_CPANEL_ALERT
+	  LF_SUDO_EMAIL_ALERT
+	  LF_SU_EMAIL_ALERT
+	  LF_SSH_EMAIL_ALERT
+	These have been changed to include the log line that triggered the
+	alert to help give context to the alert and the date/time from the
+	log to identify when the event occurred. All the relevant templates
+	are modified to include the log line for existing and new installs
+
+        Implemented an addition check for webmin that we're in the csf module
+	before creating symlink to the UI script
+
+	Fixed parameter checking for some dovecot regexes
+
+	If DEBUG is enabled and the sendmail binary fails to send an lfd alert,
+	the email text will now be logged to /var/log/lfd.log with an error
+
 14.15 - Fixed regression issue with logfile regexes
 
         Implemented an improved email wrapper
diff --git a/csf/version.txt b/csf/version.txt
index bc467a1..c6fd91f 100644
--- a/csf/version.txt
+++ b/csf/version.txt
@@ -1 +1 @@
-14.15
\ No newline at end of file
+14.16
\ No newline at end of file
diff --git a/group- b/group-
index 45c1e5b..fe91167 100644
--- a/group-
+++ b/group-
@@ -2,13 +2,13 @@ root:x:0:
 bin:x:1:
 daemon:x:2:
 sys:x:3:
-adm:x:4:
+adm:x:4:smiti
 tty:x:5:
 disk:x:6:
 lp:x:7:
 mem:x:8:
 kmem:x:9:
-wheel:x:10:vampi
+wheel:x:10:vampi,bogdan.tanase
 cdrom:x:11:
 mail:x:12:postfix,opendkim,opendmarc
 man:x:15:
@@ -104,3 +104,4 @@ litecoin:x:1019:
 bogdan:x:1020:
 squid:x:23:
 laser:x:1021:
+bogdan.tanase:x:1022:
diff --git a/gshadow- b/gshadow-
index 6e42661..ad29fca 100644
--- a/gshadow-
+++ b/gshadow-
@@ -2,13 +2,13 @@ root:::
 bin:::
 daemon:::
 sys:::
-adm:::
+adm:::smiti
 tty:::
 disk:::
 lp:::
 mem:::
 kmem:::
-wheel:::vampi
+wheel:::vampi,bogdan.tanase
 cdrom:::
 mail:::postfix,opendkim,opendmarc
 man:::
@@ -104,3 +104,4 @@ litecoin:!::
 bogdan:!::
 squid:!::
 laser:!::
+bogdan.tanase:!::
diff --git a/logrotate.d/fail2ban b/logrotate.d/fail2ban
index 13a9453..a8d3647 100644
--- a/logrotate.d/fail2ban
+++ b/logrotate.d/fail2ban
@@ -8,6 +8,9 @@
 /var/log/fail2ban.log {
     missingok
     notifempty
+	dateext
+	daily
+	rotate 14
     postrotate
       /usr/bin/fail2ban-client flushlogs >/dev/null || true
     endscript
diff --git a/logrotate.d/nginx b/logrotate.d/nginx
index 24139f6..32e2427 100644
--- a/logrotate.d/nginx
+++ b/logrotate.d/nginx
@@ -1,7 +1,8 @@
 /var/log/nginx/*.log {
         daily
         missingok
-        rotate 52
+        rotate 30
+		dateext
         compress
         delaycompress
         notifempty
diff --git a/passwd- b/passwd-
index 7bd293e..c2c8606 100644
--- a/passwd-
+++ b/passwd-
@@ -74,3 +74,5 @@ rundeck:x:1017:1018::/var/lib/rundeck:/bin/bash
 litecoin:x:1018:1019::/opt/litecoin:/bin/bash
 bogdan:x:1019:1020::/home/bogdan:/bin/bash
 squid:x:23:23::/var/spool/squid:/sbin/nologin
+laser:x:1020:1021::/home/laser:/bin/bash
+bogdan.tanase:x:1021:1022::/home/bogdan.tanase:/bin/bash
diff --git a/shadow- b/shadow-
index 90e188b..da2ef06 100644
--- a/shadow-
+++ b/shadow-
@@ -58,7 +58,7 @@ ossecr:!!:18591::::::
 ossecm:!!:18591::::::
 ossece:!!:18591::::::
 csf:!!:18595:0:99999:7:::
-smiti:$6$PEl7gUlGcX5kUoUg$SV1jPhc61CYd7iBb.S.6YT3RhMvZp26KKXx9T9UODasYG9cT5P3wGvbH6uAJusdZcXiaDaHsgYsWnQzWH051g1:18599:0:99999:7:::
+smiti:$6$lBK9J/AHYEr19bRw$GLsXaSOplBlRaGWdXWNKurJHouftuoP1rpfsNKcV1o6vHKLJkVnwhesugE/5OKGVMS20WladJHlyO0FKpTIGo1:19026:0:99999:7:::
 pesign:!!:18631::::::
 sqlgrey:x:18638:0:99999:7:::
 vmail:x:18638:0:99999:7:::
@@ -74,3 +74,5 @@ rundeck:!!:18772:0:99999:7:30::
 litecoin:!!:18775:0:99999:7:30::
 bogdan:mCxaxi7Ck2FlI:18822:0:99999:7:30::
 squid:!!:18921::::::
+laser:$6$3IDnJkLhNhDa5MUg$ysajgR6P3uElTVSBuLJbix4lHHNheJ.JBIrGFRvUPsY2/265PmO3vjgWTculxKkywvas0vcVrX3Q4QQZ/qufR.:18954:0:99999:7:30::
+bogdan.tanase:$6$.D9RFOAxWofAzule$JHgjoXa3paOjNdItuWLfYODTP.Tp.q5tiHEdDvkCD4A4f/e2A.taqRf1wQiW/PpWIoVpKoFLPvz55TkUgwIfq0:19054:0:99999:7:30::
diff --git a/subgid- b/subgid-
index 6aa29a9..72bfab5 100644
--- a/subgid-
+++ b/subgid-
@@ -17,3 +17,5 @@ mailcow:1083040:65536
 rundeck:1148576:65536
 litecoin:1214112:65536
 bogdan:1279648:65536
+laser:1345184:65536
+bogdan.tanase:1410720:65536
diff --git a/subuid- b/subuid-
index 6aa29a9..72bfab5 100644
--- a/subuid-
+++ b/subuid-
@@ -17,3 +17,5 @@ mailcow:1083040:65536
 rundeck:1148576:65536
 litecoin:1214112:65536
 bogdan:1279648:65536
+laser:1345184:65536
+bogdan.tanase:1410720:65536