diff --git a/cloudlinux7to8/actions/packages.py b/cloudlinux7to8/actions/packages.py index 1dc5da8..3d1bb65 100644 --- a/cloudlinux7to8/actions/packages.py +++ b/cloudlinux7to8/actions/packages.py @@ -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"] diff --git a/cloudlinux7to8/upgrader.py b/cloudlinux7to8/upgrader.py index 55fa670..72f1d19 100644 --- a/cloudlinux7to8/upgrader.py +++ b/cloudlinux7to8/upgrader.py @@ -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 diff --git a/dist-upgrader b/dist-upgrader index d99de3c..1e05bc1 160000 --- a/dist-upgrader +++ b/dist-upgrader @@ -1 +1 @@ -Subproject commit d99de3cf4294354c060380787d6de20e6878677d +Subproject commit 1e05bc17fa291973f5e1b36d440ac7c30ba3ade3