From 516a68fe39dfc8c16413c9fc17ed0aaafdfc2ac7 Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Fri, 10 Jun 2022 12:29:33 +0500
Subject: [PATCH 1/3] bug fix: subdomain creation on cent/alma

---
 install/install.py  | 20 ++++++++++++++++++++
 plogical/upgrade.py |  3 +++
 2 files changed, 23 insertions(+)

diff --git a/install/install.py b/install/install.py
index 48d6c197d..e109267a8 100755
--- a/install/install.py
+++ b/install/install.py
@@ -2031,6 +2031,25 @@ milter_default_action = accept
             logging.InstallLog.writeToFile('[ERROR] ' + str(msg) + " [enableDisableEmail]")
             return 0
 
+    @staticmethod
+    def fixSudoers():
+        try:
+            distroPath = '/etc/lsb-release'
+
+            if not os.path.exists(distroPath):
+                fileName = '/etc/sudoers'
+                data = open(fileName, 'r').readlines()
+
+                writeDataToFile = open(fileName, 'w')
+                for line in data:
+                    if line.find("root") > -1 and line.find("ALL=(ALL)") > -1 and line[0] != '#':
+                        writeDataToFile.writelines('root	ALL=(ALL:ALL) 	ALL\n')
+                    else:
+                        writeDataToFile.write(line)
+                writeDataToFile.close()
+        except IOError as err:
+            pass
+
     @staticmethod
     def setUpFirstAccount():
         try:
@@ -2279,6 +2298,7 @@ def main():
     checks.setupPHPAndComposer()
     checks.fix_selinux_issue()
     checks.install_psmisc()
+    checks.fixSudoers()
 
     if args.postfix is None:
         checks.install_postfix_dovecot()
diff --git a/plogical/upgrade.py b/plogical/upgrade.py
index 581f2a61d..63e9e09ba 100755
--- a/plogical/upgrade.py
+++ b/plogical/upgrade.py
@@ -248,6 +248,9 @@ class Upgrade:
                         else:
                             writeToFile.writelines(items)
 
+                        if items.find("root") > -1 and items.find("ALL=(ALL)") > -1 and items[0] != '#':
+                            writeToFile.writelines('root	ALL=(ALL:ALL) 	ALL\n')
+
                     writeToFile.close()
                 except:
                     pass

From e81583018e7315df07a24aa31a4d027baf92a04f Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Fri, 10 Jun 2022 12:37:21 +0500
Subject: [PATCH 2/3] bug fix: subdomain creation on cent/alma

---
 plogical/upgrade.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/plogical/upgrade.py b/plogical/upgrade.py
index 63e9e09ba..8cefa941f 100755
--- a/plogical/upgrade.py
+++ b/plogical/upgrade.py
@@ -245,12 +245,11 @@ class Upgrade:
                     for items in data:
                         if items.find("wheel") > -1 and items.find("ALL=(ALL)"):
                             continue
+                        elif items.find("root") > -1 and items.find("ALL=(ALL)") > -1 and items[0] != '#':
+                            writeToFile.writelines('root	ALL=(ALL:ALL) 	ALL\n')
                         else:
                             writeToFile.writelines(items)
 
-                        if items.find("root") > -1 and items.find("ALL=(ALL)") > -1 and items[0] != '#':
-                            writeToFile.writelines('root	ALL=(ALL:ALL) 	ALL\n')
-
                     writeToFile.close()
                 except:
                     pass

From fceca21a573b0c19235f45bb819dcfd1496cc19e Mon Sep 17 00:00:00 2001
From: Usman Nasir <usman@cyberpersons.com>
Date: Fri, 10 Jun 2022 14:41:33 +0500
Subject: [PATCH 3/3] bug fix: resolve
 https://github.com/usmannasir/cyberpanel/issues/855

---
 plogical/vhostConfs.py | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/plogical/vhostConfs.py b/plogical/vhostConfs.py
index 30b121484..1a1eb705d 100755
--- a/plogical/vhostConfs.py
+++ b/plogical/vhostConfs.py
@@ -36,18 +36,6 @@ accesslog $VH_ROOT/logs/$VH_NAME.access_log {
   compressArchive         1
 }
 
-errorpage 403 {
-  url                     403.html
-}
-
-errorpage 404 {
-  url                     404.html
-}
-
-errorpage 500 {
-  url                     500.html
-}
-
 scripthandler  {
   add                     lsapi:{virtualHostUser} php
 }
@@ -145,18 +133,6 @@ module cache {
  storagePath /usr/local/lsws/cachedata/$VH_NAME
 }
 
-errorpage 403 {
-  url                     403.html
-}
-
-errorpage 404 {
-  url                     404.html
-}
-
-errorpage 500 {
-  url                     500.html
-}
-
 scripthandler  {
   add                     lsapi:{externalApp} php
 }