From bfb43554512f85812d1c1e61ecd5ddc0f348a8ee Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Wed, 13 Nov 2019 19:23:14 +0500 Subject: [PATCH] bug fix: remove csf apps during upgrade --- install/install.py | 5 +++++ plogical/upgrade.py | 2 ++ 2 files changed, 7 insertions(+) diff --git a/install/install.py b/install/install.py index cd21cab01..16fa2610a 100755 --- a/install/install.py +++ b/install/install.py @@ -2177,6 +2177,10 @@ milter_default_action = accept except: pass + def installAcme(self): + command = 'wget -O - https://get.acme.sh | sh' + subprocess.call(command, shell=True) + def main(): parser = argparse.ArgumentParser(description='CyberPanel Installer') @@ -2292,6 +2296,7 @@ def main(): checks.setupCLI() checks.setup_cron() checks.installRestic() + checks.installAcme() # checks.installdnsPython() ## Install and Configure OpenDKIM. diff --git a/plogical/upgrade.py b/plogical/upgrade.py index ea55d5dfd..8d7c3db70 100755 --- a/plogical/upgrade.py +++ b/plogical/upgrade.py @@ -1444,6 +1444,8 @@ CSRF_COOKIE_SECURE = True MEDIA_URL = 1 for items in data: + if items.find('csf') > -1: + continue if items.find('MEDIA_URL') > -1: MEDIA_URL = 0