Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-15 09:46:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

feature: run custom commands after git commit/push

Browse Source
This commit is contained in:
Usman Nasir
2020-03-24 17:37:41 +05:00
parent 4524b2dec3
commit 595fc6f525
4 changed files with 126 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
static/websiteFunctions/websiteFunctions.js
View File

@@ -5836,6 +5836,8 @@ app.controller('manageGIT', function ($scope, $http, $timeout, $window) {
$scope.autoCommitCurrent = response.data.autoCommitCurrent;
$scope.autoPushCurrent = response.data.autoPushCurrent;
$scope.emailLogsCurrent = response.data.emailLogsCurrent;
$scope.currentCommands = response.data.commands;
$scope.webhookCommandCurrent = response.data.webhookCommandCurrent;
} else {
$scope.gitTracking = false;
$scope.gitEnable = true;
@@ -6675,6 +6677,8 @@ app.controller('manageGIT', function ($scope, $http, $timeout, $window) {
autoCommit: $scope.autoCommit,
autoPush: $scope.autoPush,
emailLogs: $scope.emailLogs,
commands: $scope.commands,
webhookCommand: $scope.webhookCommand
};
var config = {
@@ -6737,7 +6741,6 @@ app.controller('manageGIT', function ($scope, $http, $timeout, $window) {
$http.post(dataurl, data, config).then(ListInitialDatas, cantLoadInitialDatas);
function ListInitialDatas(response) {
$scope.cyberpanelLoading = true;
if (response.data.status === 1) {

5
websiteFunctions/static/websiteFunctions/websiteFunctions.js
View File

@@ -5836,6 +5836,8 @@ app.controller('manageGIT', function ($scope, $http, $timeout, $window) {
$scope.autoCommitCurrent = response.data.autoCommitCurrent;
$scope.autoPushCurrent = response.data.autoPushCurrent;
$scope.emailLogsCurrent = response.data.emailLogsCurrent;
$scope.currentCommands = response.data.commands;
$scope.webhookCommandCurrent = response.data.webhookCommandCurrent;
} else {
$scope.gitTracking = false;
$scope.gitEnable = true;
@@ -6675,6 +6677,8 @@ app.controller('manageGIT', function ($scope, $http, $timeout, $window) {
autoCommit: $scope.autoCommit,
autoPush: $scope.autoPush,
emailLogs: $scope.emailLogs,
commands: $scope.commands,
webhookCommand: $scope.webhookCommand
};
var config = {
@@ -6737,7 +6741,6 @@ app.controller('manageGIT', function ($scope, $http, $timeout, $window) {
$http.post(dataurl, data, config).then(ListInitialDatas, cantLoadInitialDatas);
function ListInitialDatas(response) {
$scope.cyberpanelLoading = true;
if (response.data.status === 1) {

26
websiteFunctions/templates/websiteFunctions/manageGIT.html
View File

@@ -227,6 +227,29 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{% trans "Commands" %}</label>
<div class="col-sm-9">
<textarea ng-model="$parent.commands" placeholder="Add Commands to run after every commit, separate commands using comma."
rows="4" class="form-control">{$ currentCommands $}</textarea>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{% trans "" %}</label>
<div class="col-sm-6">
<div class="checkbox">
<label>
<input ng-model="$parent.webhookCommand" type="checkbox"
value="">
Run Commands when Webhook is fired.
</label>
</div>
</div>
<div class="current-pack ng-binding">Currently: {$ webhookCommandCurrent $}
</div>
</div>
</form>
</div>
@@ -534,7 +557,8 @@
<button type="button" class="close" data-dismiss="modal">&times;
</button>
<h4 class="modal-title">{% trans "Git Logs" %} <img
ng-hide="cyberpanelLoading" src="{% static 'images/loading.gif' %}"></h4>
ng-hide="cyberpanelLoading" src="{% static 'images/loading.gif' %}">
</h4>
</div>
<div class="modal-body">

94
websiteFunctions/website.py
View File

@@ -3018,10 +3018,21 @@ StrictHostKeyChecking no
autoCommitCurrent = gitConf['autoCommit']
autoPushCurrent = gitConf['autoPush']
emailLogsCurrent = gitConf['emailLogs']
try:
commands = gitConf['commands']
except:
commands = "Add Commands to run after every commit, separate commands using comma."
try:
webhookCommandCurrent = gitConf['webhookCommand']
except:
webhookCommandCurrent = "False"
else:
autoCommitCurrent = 'Never'
autoPushCurrent = 'Never'
emailLogsCurrent = 'False'
webhookCommandCurrent = 'False'
commands = "Add Commands to run after every commit, separate commands using comma."
##
@@ -3030,7 +3041,7 @@ StrictHostKeyChecking no
data_ret = {'status': 1, 'repo': 1, 'finalBranches': branches, 'deploymentKey': deploymentKey,
'remote': remote, 'remoteResult': remoteResult, 'totalCommits': totalCommits, 'home': home,
'webHookURL': webHookURL, 'autoCommitCurrent': autoCommitCurrent,
'autoPushCurrent':autoPushCurrent, 'emailLogsCurrent': emailLogsCurrent}
'autoPushCurrent':autoPushCurrent, 'emailLogsCurrent': emailLogsCurrent, 'commands': commands, "webhookCommandCurrent": webhookCommandCurrent}
json_data = json.dumps(data_ret)
return HttpResponse(json_data)
@@ -3287,6 +3298,41 @@ StrictHostKeyChecking no
commandStatus = ProcessUtilities.outputExecutioner(command)
if commandStatus.find('nothing to commit') == -1:
gitConfFolder = '/home/cyberpanel/git/%s' % (self.domain)
finalFile = '%s/%s' % (gitConfFolder, self.folder.split('/')[-1])
gitConf = json.loads(open(finalFile, 'r').read())
web = Websites.objects.get(domain=self.domain)
try:
if gitConf['commands'] != 'NONE':
GitLogs(owner=web, type='INFO', message='Running commands after successful git commit..').save()
if gitConf['commands'].find(',') > -1:
commands = gitConf['commands'].split(',')
for command in commands:
GitLogs(owner=web, type='INFO',
message='Running: %s' % (command)).save()
result = ProcessUtilities.outputExecutioner(command, web.externalApp)
GitLogs(owner=web, type='INFO',
message='Result: %s' % (result)).save()
else:
GitLogs(owner=web, type='INFO',
message='Running: %s' % (gitConf['commands'])).save()
result = ProcessUtilities.outputExecutioner(gitConf['commands'], web.externalApp)
GitLogs(owner=web, type='INFO',
message='Result: %s' % (result)).save()
GitLogs(owner=web, type='INFO',
message='Finished running commands.').save()
except:
pass
data_ret = {'status': 1, 'commandStatus': commandStatus}
json_data = json.dumps(data_ret)
return HttpResponse(json_data)
@@ -3808,6 +3854,16 @@ StrictHostKeyChecking no
except:
dic['emailLogs'] = False
try:
dic['commands'] = data['commands']
except:
dic['commands'] = 'NONE'
try:
dic['webhookCommand'] = data['webhookCommand']
except:
dic['webhookCommand'] = False
if ACLManager.checkOwnership(self.domain, admin, currentACL) == 1:
pass
@@ -3924,6 +3980,42 @@ StrictHostKeyChecking no
if commandStatus.find('Already up to date') == -1:
message = '[Webhook Fired] Status: %s.' % (commandStatus)
GitLogs(owner=web, type='INFO', message=message).save()
gitConfFolder = '/home/cyberpanel/git/%s' % (self.domain)
finalFile = '%s/%s' % (gitConfFolder, self.folder.split('/')[-1])
gitConf = json.loads(open(finalFile, 'r').read())
web = Websites.objects.get(domain=self.domain)
try:
if gitConf['webhookCommand']:
if gitConf['commands'] != 'NONE':
GitLogs(owner=web, type='INFO', message='Running commands after successful git commit..').save()
if gitConf['commands'].find(',') > -1:
commands = gitConf['commands'].split(',')
for command in commands:
GitLogs(owner=web, type='INFO',
message='Running: %s' % (command)).save()
result = ProcessUtilities.outputExecutioner(command, web.externalApp)
GitLogs(owner=web, type='INFO',
message='Result: %s' % (result)).save()
else:
GitLogs(owner=web, type='INFO',
message='Running: %s' % (gitConf['commands'])).save()
result = ProcessUtilities.outputExecutioner(gitConf['commands'], web.externalApp)
GitLogs(owner=web, type='INFO',
message='Result: %s' % (result)).save()
GitLogs(owner=web, type='INFO',
message='Finished running commands.').save()
except:
pass
data_ret = {'status': 1, 'commandStatus': commandStatus}
json_data = json.dumps(data_ret)
return HttpResponse(json_data)