From 01fc4866f5f605a40373385140f883802dc5ce8b Mon Sep 17 00:00:00 2001
From: usmannasir <01-134132-158@student.bahria.edu.pk>
Date: Tue, 8 Jan 2019 22:38:33 +0500
Subject: [PATCH] docker manager
---
CyberCP/settings.py | 10 +-
CyberCP/urls.py | 2 +-
api/views.py | 2 +-
.../templates/baseTemplate/index.html | 2 +-
cloudAPI/cloudManager.py | 75 +++
cloudAPI/views.py | 10 +
.../templates/dockerManager/images.html | 3 +-
.../templates/dockerManager/manageImages.html | 4 +-
dockerManager/views.py | 3 -
firewall/firewallManager.py | 4 +-
install/install.py | 4 +-
locale/ja/LC_MESSAGES/django.po | 95 +--
loginSystem/views.py | 2 +-
plogical/acl.py | 135 +++--
plogical/container.py | 552 +++++++++---------
plogical/modSec.py | 53 +-
plogical/mysqlUtilities.py | 255 +++++++-
requirments.txt | 2 +
18 files changed, 734 insertions(+), 479 deletions(-)
diff --git a/CyberCP/settings.py b/CyberCP/settings.py
index 2b9518660..0dd5d5dd9 100644
--- a/CyberCP/settings.py
+++ b/CyberCP/settings.py
@@ -24,7 +24,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
SECRET_KEY = 'xr%j*p!*$0d%(-(e%@-*hyoz4$f%y77coq0u)6pwmjg4)q&19f'
# SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
+DEBUG = False
ALLOWED_HOSTS = ['*']
@@ -110,15 +110,15 @@ DATABASES = {
'ENGINE': 'django.db.backends.mysql',
'NAME': 'cyberpanel',
'USER': 'cyberpanel',
- 'PASSWORD': 'a9AwLb7zY7ZwCd',
- 'HOST': 'localhost',
- 'PORT': '',
+ 'PASSWORD': 'Bz9gF7Hr7X4RtD',
+ 'HOST': '127.0.0.1',
+ 'PORT':'3307'
},
'rootdb': {
'ENGINE': 'django.db.backends.mysql',
'NAME': 'mysql',
'USER': 'root',
- 'PASSWORD': '3bL8X7wGo0kT3b',
+ 'PASSWORD': 'sXm5VlRaAsXkDd',
'HOST': 'localhost',
'PORT': '',
},
diff --git a/CyberCP/urls.py b/CyberCP/urls.py
index 4c81d06f2..644aa6156 100644
--- a/CyberCP/urls.py
+++ b/CyberCP/urls.py
@@ -21,7 +21,6 @@ urlpatterns = [
url(r'^', include('loginSystem.urls')),
url(r'^packages/',include('packages.urls')),
url(r'^websites/',include('websiteFunctions.urls')),
- url(r'^docker/',include('dockerManager.urls')),
url(r'^tuning/',include('tuning.urls')),
url(r'^ftp/',include('ftp.urls')),
url(r'^serverstatus/',include('serverStatus.urls')),
@@ -41,4 +40,5 @@ urlpatterns = [
url(r'^plugins/',include('pluginHolder.urls')),
url(r'^emailMarketing/', include('emailMarketing.urls')),
url(r'^cloudAPI/', include('cloudAPI.urls')),
+ url(r'^docker/', include('dockerManager.urls')),
]
diff --git a/api/views.py b/api/views.py
index be6badb08..b76582714 100644
--- a/api/views.py
+++ b/api/views.py
@@ -570,7 +570,7 @@ def changeAdminPassword(request):
firstName="Cyber", lastName="Panel", acl=acl, token=token)
admin.save()
- vers = version(currentVersion="1.7", build=6)
+ vers = version(currentVersion="1.7", build=7)
vers.save()
package = Package(admin=admin, packageName="Default", diskSpace=1000,
diff --git a/baseTemplate/templates/baseTemplate/index.html b/baseTemplate/templates/baseTemplate/index.html
index 77c8fc2c7..7acf17c20 100644
--- a/baseTemplate/templates/baseTemplate/index.html
+++ b/baseTemplate/templates/baseTemplate/index.html
@@ -666,9 +666,9 @@
-
+