Merge remote-tracking branch 'refs/remotes/origin/cloudlinux' into clos-directadmin-elevation

Author: Monstrofil

packaging/leapp-repository.spec

@@ -42,7 +42,7 @@ py2_byte_compile "%1" "%2"}
 
 Name:           leapp-repository
 Version:        0.16.0
-Release:        8%{?dist}.cloudlinux
+Release:        9%{?dist}.cloudlinux
 Summary:        Repositories for leapp
 
 License:        ASL 2.0

repos/system_upgrade/cloudlinux/actors/checkpanelmemory/libraries/checkpanelmemory.py

@@ -9,13 +9,15 @@
     INTEGRATED_NAME,
     CPANEL_NAME,
     DIRECTADMIN_NAME,
+    PLESK_NAME,
 )
 
 required_memory = {
     NOPANEL_NAME: 1536 * 1024,  # 1.5 Gb
     UNKNOWN_NAME: 1536 * 1024,  # 1.5 Gb
     INTEGRATED_NAME: 1536 * 1024,  # 1.5 Gb
     DIRECTADMIN_NAME: 1536 * 1024,  # 1.5 Gb
+    PLESK_NAME: 1536 * 1024,  # 1.5 Gb
     CPANEL_NAME: 1836 * 1024,  # 1.8 Gb
 }
 

repos/system_upgrade/cloudlinux/actors/detectcontrolpanel/actor.py

@@ -11,7 +11,8 @@
     UNKNOWN_NAME,
     INTEGRATED_NAME,
     CPANEL_NAME,
-    DIRECTADMIN_NAME
+    DIRECTADMIN_NAME,
+    PLESK_NAME
 )
 
 
@@ -31,7 +32,7 @@ def process(self):
         if panel is None:
             raise StopActorExecutionError(message=("Missing information about the installed web panel."))
 
-        if panel.name in (CPANEL_NAME, DIRECTADMIN_NAME):
+        if panel.name in (CPANEL_NAME, DIRECTADMIN_NAME, PLESK_NAME):
             self.log.debug('%s detected, upgrade proceeding' % panel.name)
         elif panel.name == INTEGRATED_NAME or panel.name == UNKNOWN_NAME or panel.name == NOPANEL_NAME:
             self.log.debug('Integrated/no panel detected, upgrade proceeding')