diff --git a/mailServer/mailserverManager.py b/mailServer/mailserverManager.py index 9790c0e69..db8ec3c20 100755 --- a/mailServer/mailserverManager.py +++ b/mailServer/mailserverManager.py @@ -548,12 +548,12 @@ class MailServerManager: CentOSPath = '/etc/redhat-release' if os.path.exists(CentOSPath): - password = bcrypt.hashpw(str(password), bcrypt.gensalt()) - password = '{CRYPT}%s' % (password) + password = bcrypt.hashpw(password.encode('utf-8'), bcrypt.gensalt()) + password = '{CRYPT}%s' % (password.decode()) emailDB.password = password else: - password = bcrypt.hashpw(str(password), bcrypt.gensalt()) - password = '{CRYPT}%s' % (password) + password = bcrypt.hashpw(password.encode('utf-8'), bcrypt.gensalt()) + password = '{CRYPT}%s' % (password.decode()) emailDB.password = password emailDB.save() diff --git a/plogical/mailUtilities.py b/plogical/mailUtilities.py index 144dc2cb4..a7f9fe356 100755 --- a/plogical/mailUtilities.py +++ b/plogical/mailUtilities.py @@ -140,13 +140,13 @@ class mailUtilities: if os.path.exists(CentOSPath): password = bcrypt.hashpw(password.encode('utf-8'), bcrypt.gensalt()) - password = '{CRYPT}%s' % (password) + password = '{CRYPT}%s' % (password.decode()) emailAcct = EUsers(emailOwner=emailDomain, email=finalEmailUsername, password=password) emailAcct.mail = 'maildir:/home/vmail/%s/%s/Maildir' % (domain, userName) emailAcct.save() else: password = bcrypt.hashpw(password.encode('utf-8'), bcrypt.gensalt()) - password = '{CRYPT}%s' % (password) + password = '{CRYPT}%s' % (password.decode()) emailAcct = EUsers(emailOwner=emailDomain, email=finalEmailUsername, password=password) emailAcct.mail = 'maildir:/home/vmail/%s/%s/Maildir' % (domain, userName) emailAcct.save() @@ -192,8 +192,8 @@ class mailUtilities: CentOSPath = '/etc/redhat-release' changePass = EUsers.objects.get(email=email) if os.path.exists(CentOSPath): - password = bcrypt.hashpw(str(newPassword), bcrypt.gensalt()) - password = '{CRYPT}%s' % (password) + password = bcrypt.hashpw(newPassword.encode('utf-8'), bcrypt.gensalt()) + password = '{CRYPT}%s' % (password.decode()) changePass.password = password else: changePass.password = newPassword diff --git a/plogical/virtualHostUtilities.py b/plogical/virtualHostUtilities.py index b338e0c7f..3de959463 100755 --- a/plogical/virtualHostUtilities.py +++ b/plogical/virtualHostUtilities.py @@ -246,7 +246,7 @@ class virtualHostUtilities: 'Default', '100%', '1G', '1024', '50', '1024', '1G', '20') ProcessUtilities.normalExecutioner(command) - command = 'sudo lvectl apply all' + command = 'lvectl apply all' ProcessUtilities.normalExecutioner(command) else: try: