From eb80ea800648f9038dd749c7443cbe5a9f613f64 Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Thu, 29 Aug 2019 14:11:51 +0500 Subject: [PATCH] bug fix: git attach --- loginSystem/static/loginSystem/login-systen.js | 2 +- plogical/applicationInstaller.py | 4 +--- static/loginSystem/login-systen.js | 2 +- websiteFunctions/website.py | 1 + 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/loginSystem/static/loginSystem/login-systen.js b/loginSystem/static/loginSystem/login-systen.js index 67389830d..68a75592f 100755 --- a/loginSystem/static/loginSystem/login-systen.js +++ b/loginSystem/static/loginSystem/login-systen.js @@ -78,7 +78,7 @@ application.controller('loginSystem', function($scope,$http,$window) { } else{ $("#loginFailed").hide(); - $window.location.href = '/base'; + $window.location.href = '/base/'; } diff --git a/plogical/applicationInstaller.py b/plogical/applicationInstaller.py index 0b3a0cf3f..dbfb16109 100755 --- a/plogical/applicationInstaller.py +++ b/plogical/applicationInstaller.py @@ -558,8 +558,6 @@ class ApplicationInstaller(multi.Thread): ## checking for directories/files - logging.writeToFile(finalPath) - if self.dataLossCheck(finalPath, tempStatusPath) == 0: return 0 @@ -570,7 +568,7 @@ class ApplicationInstaller(multi.Thread): statusFile.close() try: - command = 'sudo GIT_SSH_COMMAND="ssh -o StrictHostKeyChecking=no" git clone --depth 1 --no-single-branch git@' + defaultProvider +'.com:' + username + '/' + reponame + '.git -b ' + branch + ' ' + finalPath + command = 'git clone --depth 1 --no-single-branch git@' + defaultProvider +'.com:' + username + '/' + reponame + '.git -b ' + branch + ' ' + finalPath ProcessUtilities.executioner(command, externalApp) except subprocess.CalledProcessError, msg: statusFile = open(tempStatusPath, 'w') diff --git a/static/loginSystem/login-systen.js b/static/loginSystem/login-systen.js index 67389830d..68a75592f 100644 --- a/static/loginSystem/login-systen.js +++ b/static/loginSystem/login-systen.js @@ -78,7 +78,7 @@ application.controller('loginSystem', function($scope,$http,$window) { } else{ $("#loginFailed").hide(); - $window.location.href = '/base'; + $window.location.href = '/base/'; } diff --git a/websiteFunctions/website.py b/websiteFunctions/website.py index 5006fa5fb..04a57d4ab 100755 --- a/websiteFunctions/website.py +++ b/websiteFunctions/website.py @@ -1857,6 +1857,7 @@ class WebsiteManager: configContent = """Host github.com IdentityFile /home/%s/.ssh/%s +StrictHostKeyChecking no """ % (self.domain, website.externalApp) path = "/home/cyberpanel/config"