Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-15 17:56:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

sync branch name

Browse Source
This commit is contained in:
Usman Nasir
2020-01-22 14:22:06 +05:00
parent 9301a524f7
commit ef9e154ceb
3 changed files with 56 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cyberpanel_upgrade.sh
View File

@@ -5,6 +5,7 @@ export LC_CTYPE=en_US.UTF-8
SUDO_TEST=$(set) SUDO_TEST=$(set)
SERVER_OS='Undefined' SERVER_OS='Undefined'
OUTPUT=$(cat /etc/*release) OUTPUT=$(cat /etc/*release)
BRANCH_NAME="v1.9.4"
install_utility() { install_utility() {
if [[ ! -f /usr/bin/cyberpanel_utility ]] ; then if [[ ! -f /usr/bin/cyberpanel_utility ]] ; then
@@ -99,7 +100,7 @@ rm -rf /usr/local/CyberPanel
virtualenv -p /usr/bin/python3 --system-site-packages /usr/local/CyberPanel virtualenv -p /usr/bin/python3 --system-site-packages /usr/local/CyberPanel
check_return check_return
rm -rf requirments.txt rm -rf requirments.txt
wget https://raw.githubusercontent.com/usmannasir/cyberpanel/stable/requirments.txt wget https://raw.githubusercontent.com/usmannasir/cyberpanel/$BRANCH_NAME/requirments.txt
. /usr/local/CyberPanel/bin/activate . /usr/local/CyberPanel/bin/activate
check_return check_return
@@ -118,14 +119,14 @@ fi
virtualenv -p /usr/bin/python3 --system-site-packages /usr/local/CyberPanel virtualenv -p /usr/bin/python3 --system-site-packages /usr/local/CyberPanel
check_return check_return
rm -rf upgrade.py rm -rf upgrade.py
wget https://raw.githubusercontent.com/usmannasir/cyberpanel/stable/plogical/upgrade.py wget https://raw.githubusercontent.com/usmannasir/cyberpanel/$BRANCH_NAME/plogical/upgrade.py
/usr/local/CyberPanel/bin/python upgrade.py stable /usr/local/CyberPanel/bin/python upgrade.py $BRANCH_NAME
check_return check_return
## ##
virtualenv -p /usr/bin/python3 /usr/local/CyberCP virtualenv -p /usr/bin/python3 /usr/local/CyberCP
check_return check_return
wget -O requirements.txt https://raw.githubusercontent.com/usmannasir/cyberpanel/stable/requirments.txt wget -O requirements.txt https://raw.githubusercontent.com/usmannasir/cyberpanel/$BRANCH_NAME/requirments.txt
if [ $SERVER_OS = "Ubuntu" ] ; then if [ $SERVER_OS = "Ubuntu" ] ; then
. /usr/local/CyberCP/bin/activate . /usr/local/CyberCP/bin/activate

5
preUpgrade.sh
View File

@@ -1,5 +1,8 @@
#!/bin/sh #!/bin/sh
BRANCH_NAME="v1.9.4"
rm -f /usr/local/cyberpanel_upgrade.sh rm -f /usr/local/cyberpanel_upgrade.sh
wget -O /usr/local/cyberpanel_upgrade.sh https://raw.githubusercontent.com/usmannasir/cyberpanel/stable/cyberpanel_upgrade.sh 2>/dev/null wget -O /usr/local/cyberpanel_upgrade.sh https://raw.githubusercontent.com/usmannasir/cyberpanel/$BRANCH_NAME/cyberpanel_upgrade.sh 2>/dev/null
chmod 700 /usr/local/cyberpanel_upgrade.sh chmod 700 /usr/local/cyberpanel_upgrade.sh
/usr/local/cyberpanel_upgrade.sh /usr/local/cyberpanel_upgrade.sh

47
static/IncBackups/IncBackups.js
View File

@@ -741,6 +741,53 @@ app.controller('scheduleBackupInc', function ($scope, $http) {
}; };
$scope.editInitial = function (id) {
$scope.jobID = id;
$scope.cyberpanelLoading = false;
url = "/IncrementalBackups/fetchSites";
var data = {id: id};
var config = {
headers: {
'X-CSRFToken': getCookie('csrftoken')
}
};
$http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas);
function ListInitialDatas(response) {
$scope.cyberpanelLoading = true;
if (response.data.status === 1) {
$scope.websites = JSON.parse(response.data.data);
} else {
new PNotify({
title: 'Operation Failed!',
text: response.data.error_message,
type: 'error'
});
}
}
function cantLoadInitialDatas(response) {
$scope.cyberpanelLoading = true;
new PNotify({
title: 'Operation Failed!',
text: 'Could not connect to server, please refresh this page',
type: 'error'
});
}
};
}); });