diff --git a/dockerManager/migrations/__init__.py b/dockerManager/migrations/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/install/install.py b/install/install.py index 8cbe2dcf5..046b090aa 100644 --- a/install/install.py +++ b/install/install.py @@ -780,8 +780,8 @@ class preFlightsChecks: os.chdir(self.path) - #command = "wget http://cyberpanel.sh/CyberPanel.1.7.7.tar.gz" - command = "wget http://cyberpanel.sh/CyberPanelTemp.tar.gz" + command = "wget http://cyberpanel.sh/CyberPanel.1.7.7.tar.gz" + #command = "wget http://cyberpanel.sh/CyberPanelTemp.tar.gz" preFlightsChecks.call(command, self.distro, '[download_install_CyberPanel]', 'CyberPanel Download', 1, 1, os.EX_OSERR) @@ -789,8 +789,8 @@ class preFlightsChecks: ## count = 0 - #command = "tar zxf CyberPanel.1.7.7.tar.gz" - command = "tar zxf CyberPanelTemp.tar.gz" + command = "tar zxf CyberPanel.1.7.7.tar.gz" + #command = "tar zxf CyberPanelTemp.tar.gz" preFlightsChecks.call(command, self.distro, '[download_install_CyberPanel]', 'Extract CyberPanel',1, 1, os.EX_OSERR) diff --git a/s3Backups/s3Backups.py b/s3Backups/s3Backups.py index ffb121001..c3f936c79 100644 --- a/s3Backups/s3Backups.py +++ b/s3Backups/s3Backups.py @@ -190,7 +190,7 @@ class S3Backups(multi.Thread): admin = Administrator.objects.get(pk=userID) - newPlan = BackupPlan(owner=admin, name=self.data['planName'], freq = self.data['frequency'], + newPlan = BackupPlan(owner=admin, name=self.data['planName'].replace(' ', ''), freq = self.data['frequency'], retention= self.data['retenion'], bucket= self.data['bucketName']) newPlan.save() @@ -586,7 +586,7 @@ class S3Backups(multi.Thread): admin = Administrator.objects.get(pk=userID) - newPlan = BackupPlanDO(owner=admin, name=self.data['planName'], freq = self.data['frequency'], + newPlan = BackupPlanDO(owner=admin, name=self.data['planName'].replace(' ', ''), freq = self.data['frequency'], retention= self.data['retenion'], bucket= self.data['bucketName'], type= self.data['type'], region= self.data['region']) newPlan.save()