Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions cloudlinux7to8/actions/packages.py
Original file line number Diff line number Diff line change
Expand Up @@ -500,30 +500,6 @@ def _revert_action(self) -> action.ActionResult:
return action.ActionResult()


class RestoreMissingNginx(action.ActiveAction):
def __init__(self) -> None:
self.name = "restore nginx if it was removed during the conversion"

def _is_required(self) -> bool:
# nginx related to plesk could be removed by user. So we need to make sure
# it is installed before we start the conversion
return packages.is_package_installed("sw-nginx")

def _prepare_action(self) -> action.ActionResult:
return action.ActionResult()

def _post_action(self) -> action.ActionResult:
if not packages.is_package_installed("sw-nginx"):
util.logged_check_call(["/usr/sbin/plesk", "installer", "add", "--components", "nginx"])
return action.ActionResult()

def _revert_action(self) -> action.ActionResult:
return action.ActionResult()

def estimate_post_time(self) -> int:
return 3 * 60


class AssertNoOutdatedLetsEncryptExtRepository(action.CheckAction):
OUTDATED_LETSENCRYPT_REPO_PATHS = ["/etc/yum.repos.d/plesk-letsencrypt.repo", "/etc/yum.repos.d/plesk-ext-letsencrypt.repo"]

Expand Down
2 changes: 1 addition & 1 deletion cloudlinux7to8/upgrader.py
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ def construct_actions(
custom_actions.DisableSuspiciousKernelModules(),
common_actions.HandleUpdatedSpamassassinConfig(),
common_actions.DisableSelinuxDuringUpgrade(),
custom_actions.RestoreMissingNginx(),
common_actions.RestoreMissingNginx(),
common_actions.ReinstallAmavisAntivirus(),
custom_actions.HandleInternetxRepository(),
# We need to remove the python3-ethtool package because it causes issues on
Expand Down
Loading