diff --git a/cyberpanel.sh b/cyberpanel.sh index 7ff51b0c8..e58438c0c 100644 --- a/cyberpanel.sh +++ b/cyberpanel.sh @@ -1082,9 +1082,11 @@ if [[ $DEV == "ON" ]] ; then cd /usr/local/ virtualenv -p /usr/bin/python3 CyberPanel source /usr/local/CyberPanel/bin/activate - wget -O requirements.txt https://$GIT_CONTENT_URL/${BRANCH_NAME}/requirments.txt + wget -O /usr/local/cyberpanel-pip.zip https://repo.cyberpanel.net/cyberpanel-pip.zip check_return - pip3.6 install --ignore-installed -r requirements.txt + unzip /usr/local/cyberpanel-pip.zip -d /usr/local + check_return + pip3.6 install /usr/local/pip-packs/* check_return cd - fi @@ -1176,9 +1178,7 @@ EOF virtualenv -p /usr/bin/python3 /usr/local/CyberCP source /usr/local/CyberCP/bin/activate -wget -O requirements.txt https://$GIT_CONTENT_URL/${BRANCH_NAME}/requirments.txt -check_return -pip3.6 install --ignore-installed -r requirements.txt +pip3.6 install /usr/local/pip-packs/* check_return systemctl restart lscpd fi diff --git a/plogical/upgrade.py b/plogical/upgrade.py index 3f965f126..2a3f2a244 100755 --- a/plogical/upgrade.py +++ b/plogical/upgrade.py @@ -1987,8 +1987,6 @@ failovermethod=priority CentOSPath = '/etc/redhat-release' if os.path.exists(CentOSPath): - command = 'yum-config-manager --add-repo https://copr.fedorainfracloud.org/coprs/copart/restic/repo/epel-7/copart-restic-epel-7.repo' - Upgrade.executioner(command, 'Add restic repo.') command = 'yum install restic -y' Upgrade.executioner(command, 'Install Restic')