feature: allow custom path for child-domains

usmannasir · Apr 4, 2020 · 2d891fd · 2d891fd · Ezyweb-uk · Apr 6, 2020
1 parent a82a1bf
commit 2d891fd
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/baseTemplate/views.py b/baseTemplate/views.py
@@ -19,7 +19,7 @@
 # Create your views here.
 
 VERSION = '2.0'
-BUILD = 0
+BUILD = 1
 
 @ensure_csrf_cookie
 def renderBase(request):

diff --git a/install/install.py b/install/install.py
@@ -15,7 +15,7 @@
 import stat
 
 VERSION = '2.0'
-BUILD = 0
+BUILD = 1
 
 char_set = {'small': 'abcdefghijklmnopqrstuvwxyz',
             'nums': '0123456789',

diff --git a/loginSystem/views.py b/loginSystem/views.py
@@ -19,7 +19,7 @@
 # Create your views here.
 
 VERSION = '2.0'
-BUILD = 0
+BUILD = 1
 
 def verifyLogin(request):
     try:

diff --git a/plogical/adminPass.py b/plogical/adminPass.py
@@ -13,7 +13,7 @@
 from baseTemplate.models import version
 
 VERSION = '2.0'
-BUILD = 0
+BUILD = 1
 
 if not os.geteuid() == 0:
     sys.exit("\nOnly root can run this script\n")

diff --git a/plogical/upgrade.py b/plogical/upgrade.py
@@ -14,7 +14,7 @@
 import string
 
 VERSION = '2.0'
-BUILD = 0
+BUILD = 1
 
 class Upgrade:
     logPath = "/usr/local/lscp/logs/upgradeLog"

diff --git a/plogical/vhost.py b/plogical/vhost.py
@@ -857,7 +857,7 @@ def createDirectoryForDomain(masterDomain, domain, phpVersion, path, administrat
             cmd = shlex.split(command)
             subprocess.call(cmd, stdout=FNULL, stderr=subprocess.STDOUT)
 
-            command = "chmod 755 %s" % (path)
+            command = "chmod 750 %s" % (path)
             cmd = shlex.split(command)
             subprocess.call(cmd, stdout=FNULL, stderr=subprocess.STDOUT)
 

diff --git a/websiteFunctions/templates/websiteFunctions/website.html b/websiteFunctions/templates/websiteFunctions/website.html
@@ -303,7 +303,7 @@ <h3 class="glyph-icon icon-close text-danger mt-5"></h3>
                                     </div>
 
                                     <div ng-hide="installationDetailsForm" class="form-group">
-                                        <label class="col-sm-3 control-label">{% trans "Path" %}</label>
+                                        <label class="col-sm-3 control-label">{% trans "Path" %}: /home/{{ domain }}/ </label>
                                         <div class="col-sm-6">
                                             <input placeholder="{% trans 'This path is relative to: ' %}{$ masterDomain $}. {% trans 'Leave empty to set default.' %}"
                                                    type="text" class="form-control" ng-model="docRootPath" required>

diff --git a/websiteFunctions/website.py b/websiteFunctions/website.py
@@ -285,9 +285,9 @@ def submitDomainCreation(self, userID=None, data=None):
 
             if len(path) > 0:
                 path = path.lstrip("/")
-                path = "/home/" + masterDomain + "/public_html/" + path
+                path = "/home/" + masterDomain + "/" + path
             else:
-                path = "/home/" + masterDomain + "/public_html/" + domain
+                path = "/home/" + masterDomain + "/" + domain
 
             try:
                 apacheBackend = str(data['apacheBackend'])