bug fix: #1180

usmannasir · Jan 13, 2024 · 574fb18 · 574fb18
1 parent a99c1fa
commit 574fb18
Showing 1 changed file with 41 additions and 36 deletions.
diff --git a/ApachController/ApacheController.py b/ApachController/ApacheController.py
@@ -9,7 +9,12 @@
 
 class ApacheController:
     apacheInstallStatusPath = '/home/cyberpanel/apacheInstallStatus'
-    serverRootPath = '/etc/httpd'
+
+    if ProcessUtilities.decideDistro() == ProcessUtilities.centos or ProcessUtilities.decideDistro() == ProcessUtilities.cent8:
+        serverRootPath = '/etc/httpd'
+    else:
+        serverRootPath = '/etc/apache2'
+
     mpmConfigs = """# Select the MPM module which should be used by uncommenting exactly
 # one of the following LoadModule lines:
 
@@ -44,44 +49,44 @@ class ApacheController:
     def checkIfApacheInstalled():
         try:
             if os.path.exists(ApacheController.serverRootPath):
-                pass
-            else:
-                return 0
-
-            if os.path.exists(ApacheVhost.php54Path):
-                pass
-            else:
-                return 0
-
-            if os.path.exists(ApacheVhost.php55Path):
-                pass
-            else:
-                return 0
-
-            if os.path.exists(ApacheVhost.php56Path):
-                pass
-            else:
-                return 0
-
-            if os.path.exists(ApacheVhost.php70Path):
-                pass
-            else:
-                return 0
-
-            if os.path.exists(ApacheVhost.php71Path):
-                pass
-            else:
-                return 0
-
-            if os.path.exists(ApacheVhost.php72Path):
-                pass
-            else:
-                return 0
-
-            if os.path.exists(ApacheVhost.php73Path):
                 return 1
             else:
                 return 0
+
+            # if os.path.exists(ApacheVhost.php54Path):
+            #     pass
+            # else:
+            #     return 0
+            #
+            # if os.path.exists(ApacheVhost.php55Path):
+            #     pass
+            # else:
+            #     return 0
+            #
+            # if os.path.exists(ApacheVhost.php56Path):
+            #     pass
+            # else:
+            #     return 0
+            #
+            # if os.path.exists(ApacheVhost.php70Path):
+            #     pass
+            # else:
+            #     return 0
+            #
+            # if os.path.exists(ApacheVhost.php71Path):
+            #     pass
+            # else:
+            #     return 0
+            #
+            # if os.path.exists(ApacheVhost.php72Path):
+            #     pass
+            # else:
+            #     return 0
+            #
+            # if os.path.exists(ApacheVhost.php73Path):
+            #     return 1
+            # else:
+            #     return 0
         except BaseException as msg:
             message = "%s. [%s]" % (str(msg), '[ApacheController.checkIfApacheInstalled]')
             logging.CyberCPLogFileWriter.writeToFile(message)