From d822f9fe8315e77c27704004734ab0efd6ca97fd Mon Sep 17 00:00:00 2001 From: Muttahir Aon Syed Date: Mon, 5 Oct 2020 19:10:00 +0500 Subject: [PATCH 1/4] adding salt.php Randomly generated salt for rainloop --- install/install.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/install/install.py b/install/install.py index ef821aba6..f843636a2 100755 --- a/install/install.py +++ b/install/install.py @@ -2379,6 +2379,12 @@ echo $oConfig->Save() ? 'Done' : 'Error'; writeToFile.write(content) writeToFile.close() + content = """'%s'""" % (randomPassword.generate_pass()) + writeToFile = open('/usr/local/CyberCP/public/rainloop.php_data_/_default_/configs/salt.php', 'w') + writeToFile.write(content) + writeToFile.close() + + command = '/usr/local/lsws/lsphp72/bin/php /usr/local/CyberCP/public/rainloop.php' subprocess.call(shlex.split(command)) From a2777b270afd13076a54ce7b96468f5e4f45b0bc Mon Sep 17 00:00:00 2001 From: Muttahir Aon Syed Date: Mon, 5 Oct 2020 19:36:01 +0500 Subject: [PATCH 2/4] fix salt fix location --- install/install.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/install.py b/install/install.py index f843636a2..95ee1d43d 100755 --- a/install/install.py +++ b/install/install.py @@ -2354,7 +2354,7 @@ def main(): # command = 'mkdir -p /usr/local/lscp/cyberpanel/rainloop/data/data/default/configs/' # subprocess.call(shlex.split(command)) - writeToFile = open('/usr/local/CyberCP/public/rainloop.php_data_/_default_/configs/application.ini', 'a') + writeToFile = open('/usr/local/lscp/cyberpanel/rainloop/data/_data_/_default_/configs/application.ini', 'a') writeToFile.write(""" [security] admin_login = "admin" @@ -2380,7 +2380,7 @@ echo $oConfig->Save() ? 'Done' : 'Error'; writeToFile.close() content = """'%s'""" % (randomPassword.generate_pass()) - writeToFile = open('/usr/local/CyberCP/public/rainloop.php_data_/_default_/configs/salt.php', 'w') + writeToFile = open('/usr/local/lscp/cyberpanel/rainloop/data/_data_/_default_/configs/salt.php', 'w') writeToFile.write(content) writeToFile.close() From ae4f65b5acb2d98b0b46aa049aeaac018f0500d3 Mon Sep 17 00:00:00 2001 From: Muttahir Aon Syed Date: Mon, 5 Oct 2020 20:12:17 +0500 Subject: [PATCH 3/4] Fix permission after password changw --- install/install.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/install/install.py b/install/install.py index 95ee1d43d..0c5ac3479 100755 --- a/install/install.py +++ b/install/install.py @@ -2379,14 +2379,12 @@ echo $oConfig->Save() ? 'Done' : 'Error'; writeToFile.write(content) writeToFile.close() - content = """'%s'""" % (randomPassword.generate_pass()) - writeToFile = open('/usr/local/lscp/cyberpanel/rainloop/data/_data_/_default_/configs/salt.php', 'w') - writeToFile.write(content) - writeToFile.close() - command = '/usr/local/lsws/lsphp72/bin/php /usr/local/CyberCP/public/rainloop.php' subprocess.call(shlex.split(command)) + + command = "chown -R lscpd:lscpd /usr/local/lscp/cyberpanel/rainloop/data" + preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR) except: pass From 65fca9263e6939384921503930a062cd41e49693 Mon Sep 17 00:00:00 2001 From: Muttahir Aon Syed Date: Mon, 5 Oct 2020 20:45:58 +0500 Subject: [PATCH 4/4] Permission fix Another fix --- install/install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/install.py b/install/install.py index 0c5ac3479..a848f2c27 100755 --- a/install/install.py +++ b/install/install.py @@ -2384,7 +2384,7 @@ echo $oConfig->Save() ? 'Done' : 'Error'; subprocess.call(shlex.split(command)) command = "chown -R lscpd:lscpd /usr/local/lscp/cyberpanel/rainloop/data" - preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR) + subprocess.call(shlex.split(command)) except: pass