This commit is contained in:
parent
e8785ce5ba
commit
a8387cda39
|
|
@ -5,7 +5,7 @@ class CLMain():
|
|||
self.path = '/usr/local/CyberCP/version.txt'
|
||||
#versionInfo = json.loads(open(self.path, 'r').read())
|
||||
self.version = '2.3'
|
||||
self.build = '4'
|
||||
self.build = '5'
|
||||
|
||||
ipFile = "/etc/cyberpanel/machineIP"
|
||||
f = open(ipFile)
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ from plogical.httpProc import httpProc
|
|||
# Create your views here.
|
||||
|
||||
VERSION = '2.3'
|
||||
BUILD = 4
|
||||
BUILD = 5
|
||||
|
||||
|
||||
@ensure_csrf_cookie
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ from stat import *
|
|||
import stat
|
||||
|
||||
VERSION = '2.3'
|
||||
BUILD = 4
|
||||
BUILD = 5
|
||||
|
||||
char_set = {'small': 'abcdefghijklmnopqrstuvwxyz', 'nums': '0123456789', 'big': 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'}
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ from django.utils import translation
|
|||
# Create your views here.
|
||||
|
||||
VERSION = '2.3'
|
||||
BUILD = 4
|
||||
BUILD = 5
|
||||
|
||||
|
||||
def verifyLogin(request):
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ from packages.models import Package
|
|||
from baseTemplate.models import version
|
||||
|
||||
VERSION = '2.3'
|
||||
BUILD = 4
|
||||
BUILD = 5
|
||||
|
||||
if not os.geteuid() == 0:
|
||||
sys.exit("\nOnly root can run this script\n")
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ except:
|
|||
pass
|
||||
|
||||
VERSION = '2.3'
|
||||
BUILD = 4
|
||||
BUILD = 5
|
||||
|
||||
|
||||
## I am not the monster that you think I am..
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
import json
|
||||
import os
|
||||
import os.path
|
||||
import sys
|
||||
|
|
@ -17,7 +18,7 @@ import random
|
|||
import string
|
||||
|
||||
VERSION = '2.3'
|
||||
BUILD = 4
|
||||
BUILD = 5
|
||||
|
||||
CENTOS7 = 0
|
||||
CENTOS8 = 1
|
||||
|
|
@ -667,10 +668,10 @@ $cfg['Servers'][$i]['LogoutURL'] = 'phpmyadminsignin.php?logout';
|
|||
version_build = str(BUILD)
|
||||
|
||||
try:
|
||||
Content = {"version":version_number,"build":version_build}
|
||||
path = "/usr/local/CyberCP/version.txt"
|
||||
writeToFile = open(path, 'w')
|
||||
writeToFile.writelines(version_number + '\n')
|
||||
writeToFile.writelines(version_build)
|
||||
writeToFile.write(json.dumps(Content))
|
||||
writeToFile.close()
|
||||
except:
|
||||
pass
|
||||
|
|
@ -3307,6 +3308,7 @@ pm.max_spare_servers = 3
|
|||
##
|
||||
|
||||
Upgrade.downloadAndUpgrade(versionNumbring, branch)
|
||||
versionNumbring = Upgrade.downloadLink()
|
||||
Upgrade.download_install_phpmyadmin()
|
||||
Upgrade.downoad_and_install_raindloop()
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ EXPIRE = 3
|
|||
### Version
|
||||
|
||||
VERSION = '2.3'
|
||||
BUILD = 4
|
||||
BUILD = 5
|
||||
|
||||
def serverStatusHome(request):
|
||||
proc = httpProc(request, 'serverStatus/index.html',
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
{"version":"2.3","build":1}
|
||||
{"version":"2.3","build":5}
|
||||
Loading…
Reference in New Issue