Skip to content

Commit c82e9d7

Browse files
authored
Merge pull request #14 from cloudlinux/clos-2623-directadmin-elevation
Adding basic DirectAdmin elevation support
2 parents a04faa5 + 0e81dcd commit c82e9d7

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@
88
UNKNOWN_NAME,
99
INTEGRATED_NAME,
1010
CPANEL_NAME,
11+
DIRECTADMIN_NAME,
1112
)
1213

1314
required_memory = {
1415
NOPANEL_NAME: 1536 * 1024, # 1.5 Gb
1516
UNKNOWN_NAME: 1536 * 1024, # 1.5 Gb
1617
INTEGRATED_NAME: 1536 * 1024, # 1.5 Gb
18+
DIRECTADMIN_NAME: 1536 * 1024, # 1.5 Gb
1719
CPANEL_NAME: 1836 * 1024, # 1.8 Gb
1820
}
1921

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
UNKNOWN_NAME,
1212
INTEGRATED_NAME,
1313
CPANEL_NAME,
14+
DIRECTADMIN_NAME
1415
)
1516

1617

@@ -30,8 +31,8 @@ def process(self):
3031
if panel is None:
3132
raise StopActorExecutionError(message=("Missing information about the installed web panel."))
3233

33-
if panel.name == CPANEL_NAME:
34-
self.log.debug('cPanel detected, upgrade proceeding')
34+
if panel.name in (CPANEL_NAME, DIRECTADMIN_NAME):
35+
self.log.debug('%s detected, upgrade proceeding' % panel.name)
3536
elif panel.name == INTEGRATED_NAME or panel.name == UNKNOWN_NAME or panel.name == NOPANEL_NAME:
3637
self.log.debug('Integrated/no panel detected, upgrade proceeding')
3738
elif panel:

0 commit comments

Comments
 (0)