Added host-types
This commit is contained in:
parent
5156397efc
commit
d636160751
GPG Key ID:
28CCCB8F62BFADD6
|
|
@ -1,6 +1,7 @@
|
|||
$(function() {
|
||||
initDatePickers();
|
||||
initCronType();
|
||||
initHostType();
|
||||
initVarInputs();
|
||||
initIntervalPattern();
|
||||
bsCustomFileInput.init()
|
||||
|
|
@ -22,6 +23,30 @@ function initCronType()
|
|||
|
||||
$('.crontype-inputs:not(.hidden) input').prop('disabled', false);
|
||||
$('.crontype-inputs.hidden input').prop('disabled', true);
|
||||
|
||||
if(type != 'http') {
|
||||
$('.croncategory-group').addClass('btn-group');
|
||||
$('.hosttype-group').removeClass('hidden');
|
||||
} else {
|
||||
$('.croncategory-group').removeClass('btn-group');
|
||||
$('.hosttype-group').addClass('hidden');
|
||||
$('.hosttype-inputs').addClass('hidden');
|
||||
|
||||
$('.hosttype-inputs:not(.hidden) input').prop('disabled', false);
|
||||
$('.hosttype-inputs.hidden input').prop('disabled', true);
|
||||
}
|
||||
})
|
||||
}
|
||||
function initHostType()
|
||||
{
|
||||
$('.hosttype-item').on('click', function() {
|
||||
let type = $(this).data('type');
|
||||
$('.hosttype').val(type);
|
||||
$('.hosttype-inputs:not(.hidden)').addClass('hidden');
|
||||
$('.hosttype-' + type).removeClass('hidden');
|
||||
|
||||
$('.hosttype-inputs:not(.hidden) input').prop('disabled', false);
|
||||
$('.hosttype-inputs.hidden input').prop('disabled', true);
|
||||
})
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ class Job
|
|||
|
||||
public function addJob(array $values)
|
||||
{
|
||||
if(empty($values['type']) ||
|
||||
if(empty($values['crontype']) ||
|
||||
empty($values['name']) ||
|
||||
empty($values['interval']) ||
|
||||
empty($values['nextrun'])
|
||||
|
|
@ -45,29 +45,12 @@ class Job
|
|||
}
|
||||
|
||||
$values['nextrun'] = DateTime::createFromFormat('m/d/Y g:i:s A', $values['nextrun'])->getTimestamp();
|
||||
$data['type'] = $values['type'];
|
||||
$data['crontype'] = $values['crontype'];
|
||||
$data['hosttype'] = $values['hosttype'];
|
||||
|
||||
switch($data['type'])
|
||||
switch($data['crontype'])
|
||||
{
|
||||
case 'local':
|
||||
$data['command'] = $values['command'];
|
||||
$data['host'] = 'localhost';
|
||||
break;
|
||||
case 'ssh':
|
||||
$data['host'] = $values['host'];
|
||||
$data['user'] = $values['user'];
|
||||
if(!empty($values['privkey-password'])) {
|
||||
$newsecretkey = count($values['var-value']);
|
||||
$values['var-id'][$newsecretkey] = 'privkey-password';
|
||||
$values['var-issecret'][$newsecretkey] = true;
|
||||
$values['var-value'][$newsecretkey] = $values['privkey-password'];
|
||||
}
|
||||
if(!empty($_FILES['privkey']['tmp_name'])) {
|
||||
$newsecretkey = count($values['var-value']);
|
||||
$values['var-id'][$newsecretkey] = 'ssh-privkey';
|
||||
$values['var-issecret'][$newsecretkey] = true;
|
||||
$values['var-value'][$newsecretkey] = base64_encode(file_get_contents($_FILES['privkey']['tmp_name']));
|
||||
}
|
||||
case 'command':
|
||||
$data['command'] = $values['command'];
|
||||
break;
|
||||
case 'reboot':
|
||||
|
|
@ -103,6 +86,28 @@ class Job
|
|||
break;
|
||||
}
|
||||
|
||||
switch($data['hosttype']) {
|
||||
case 'local':
|
||||
$data['host'] = 'localhost';
|
||||
break;
|
||||
case 'ssh':
|
||||
$data['host'] = $values['host'];
|
||||
$data['user'] = $values['user'];
|
||||
if(!empty($values['privkey-password'])) {
|
||||
$newsecretkey = count($values['var-value']);
|
||||
$values['var-id'][$newsecretkey] = 'privkey-password';
|
||||
$values['var-issecret'][$newsecretkey] = true;
|
||||
$values['var-value'][$newsecretkey] = $values['privkey-password'];
|
||||
}
|
||||
if(!empty($_FILES['privkey']['tmp_name'])) {
|
||||
$newsecretkey = count($values['var-value']);
|
||||
$values['var-id'][$newsecretkey] = 'ssh-privkey';
|
||||
$values['var-issecret'][$newsecretkey] = true;
|
||||
$values['var-value'][$newsecretkey] = base64_encode(file_get_contents($_FILES['privkey']['tmp_name']));
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
if(!empty($values['var-value'])) {
|
||||
foreach($values['var-value'] as $key => $name) {
|
||||
if(!empty($name)) {
|
||||
|
|
@ -121,7 +126,7 @@ class Job
|
|||
$addJobSql = "INSERT INTO job(name, data, interval, nextrun, lastrun) VALUES (:name, :data, :interval, :nextrun, :lastrun)";
|
||||
|
||||
$addJobStmt = $this->dbcon->prepare($addJobSql);
|
||||
$addJobStmt->execute([':name' => $values['name'], ':data' => $data, ':interval' => $values['interval'], ':nextrun' => $values['nextrun'], ':lastrun' => $values['lastrun'], ]);
|
||||
$addJobStmt->executeQuery([':name' => $values['name'], ':data' => $data, ':interval' => $values['interval'], ':nextrun' => $values['nextrun'], ':lastrun' => $values['lastrun'], ]);
|
||||
|
||||
return ['success' => true, 'message' => 'Cronjob succesfully added'];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,58 +37,32 @@
|
|||
</div>
|
||||
|
||||
<h3>Job details</h3>
|
||||
<div class="mb-3">
|
||||
<div class="dropdown">
|
||||
<div class="mb-3 btn-group">
|
||||
<div class="dropdown croncategory-group crontype-group">
|
||||
<button class="btn btn-outline-primary dropdown-toggle" type="button" id="crontypeButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
||||
Job type
|
||||
</button>
|
||||
<div class="dropdown-menu" aria-labelledby="crontypeButton">
|
||||
<a class="dropdown-item crontype-item" href="#" data-type="local">Local</a>
|
||||
<a class="dropdown-item crontype-item" href="#" data-type="ssh">Ssh</a>
|
||||
<a class="dropdown-item crontype-item" href="#" data-type="docker">Docker</a>
|
||||
<a class="dropdown-item crontype-item" href="#" data-type="docker-ssh">Docker over SSH</a>
|
||||
<a class="dropdown-item crontype-item" href="#" data-type="command">Command</a>
|
||||
<a class="dropdown-item crontype-item" href="#" data-type="reboot">Reboot</a>
|
||||
<a class="dropdown-item crontype-item" href="#" data-type="reboot-ssh">Reboot over SSH</a>
|
||||
<a class="dropdown-item crontype-item" href="#" data-type="http">Http request</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="crontype-local crontype-inputs hidden">
|
||||
<div class="mb-3">
|
||||
<label for="command">Command</label>
|
||||
<input type="text" name="command" class="form-control" id="command" placeholder="sudo apt update">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="crontype-ssh crontype-inputs hidden">
|
||||
<div class="mb-3">
|
||||
<label for="host">Hostname</label>
|
||||
<input type="text" name="host" class="form-control" id="host" placeholder="ssh.abc.xyz">
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label for="user">Username</label>
|
||||
<input type="text" name="user" class="form-control" id="user" placeholder="larry">
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label for="privkey">Private key</label>
|
||||
<div class="custom-file">
|
||||
<input type="file" class="custom-file-input" id="privkey" name="privkey">
|
||||
<label class="custom-file-label" for="privkey">Choose file</label>
|
||||
<div class="dropdown croncategory-group hidden hosttype-group">
|
||||
<button class="btn btn-outline-primary dropdown-toggle" type="button" id="hosttypeButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
||||
Host type
|
||||
</button>
|
||||
<div class="dropdown-menu" aria-labelledby="hosttypeButton">
|
||||
<a class="dropdown-item hosttype-item" href="#" data-type="localhost">Localhost</a>
|
||||
<a class="dropdown-item hosttype-item" href="#" data-type="ssh">SSH</a>
|
||||
<a class="dropdown-item hosttype-item" href="#" data-type="docker">Docker</a>
|
||||
<a class="dropdown-item hosttype-item" href="#" data-type="docker-ssh">Docker over SSH</a>
|
||||
</div>
|
||||
<small id="basicauth-password-help" class="form-text text-muted">This file is being saved as a secret</small>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="mb-3">
|
||||
<label for="privkey-password">Password for private key</label>
|
||||
<input type="password" name="privkey-password" class="form-control" placeholder="correct horse battery staple">
|
||||
<small id="privkey-password-help" class="form-text text-muted">If private key is empty this field is being used as ssh-password</small>
|
||||
<small id="privkey-password-help-2" class="form-text text-muted">This field is being saved as a secret</small>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="crontype-command crontype-inputs hidden">
|
||||
<h4>Command details</h4>
|
||||
<div class="mb-3">
|
||||
<label for="command">Command</label>
|
||||
<input type="text" name="command" class="form-control" id="command" placeholder="sudo apt update">
|
||||
|
|
@ -96,6 +70,7 @@
|
|||
</div>
|
||||
|
||||
<div class="crontype-reboot crontype-inputs hidden">
|
||||
<h4>Reboot job details</h4>
|
||||
<div class="mb-3">
|
||||
<label for="reboot-command">Reboot command</label>
|
||||
<input type="text" name="reboot-command" class="form-control" id="command" placeholder="systemctl reboot">
|
||||
|
|
@ -121,6 +96,7 @@
|
|||
</div>
|
||||
|
||||
<div class="crontype-http crontype-inputs hidden">
|
||||
<h4>HTTP request details</h4>
|
||||
<div class="mb-3">
|
||||
<label for="url">Url</label>
|
||||
<input type="text" name="url" class="form-control" id="url" placeholder="https://scripts.example.com/">
|
||||
|
|
@ -136,6 +112,36 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="hosttype-ssh hosttype-inputs hidden">
|
||||
<h4>SSH host details</h4>
|
||||
<div class="mb-3">
|
||||
<label for="host">Hostname</label>
|
||||
<input type="text" name="host" class="form-control" id="host" placeholder="ssh.abc.xyz">
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label for="user">Username</label>
|
||||
<input type="text" name="user" class="form-control" id="user" placeholder="larry">
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label for="privkey">Private key</label>
|
||||
<div class="custom-file">
|
||||
<input type="file" class="custom-file-input" id="privkey" name="privkey">
|
||||
<label class="custom-file-label" for="privkey">Choose file</label>
|
||||
</div>
|
||||
<small id="custom-file-help" class="form-text text-muted">This file is being saved as a secret</small>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="mb-3">
|
||||
<label for="privkey-password">Password for private key</label>
|
||||
<input type="password" name="privkey-password" class="form-control" placeholder="correct horse battery staple">
|
||||
<small id="privkey-password-help" class="form-text text-muted">If private key is empty this field is being used as ssh-password</small>
|
||||
<small id="privkey-password-help-2" class="form-text text-muted">This field is being saved as a secret</small>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3>Variables</h3>
|
||||
<div class="vars mb-3">
|
||||
<div class="input-group var-group hidden">
|
||||
|
|
@ -159,7 +165,7 @@
|
|||
<div class="mb-3">
|
||||
<a href="#" class="btn btn-outline-primary addvar-btn">Add variable</a>
|
||||
</div>
|
||||
<input type="hidden" name="type" class="crontype" value=""><button type="submit" class="btn btn-outline-primary">Submit</button>
|
||||
<input type="hidden" name="crontype" class="crontype" value=""><input type="hidden" name="hosttype" class="hosttype" value=""><button type="submit" class="btn btn-outline-primary">Submit</button>
|
||||
</form>
|
||||
|
||||
{% endblock %}
|
||||
|
|
|
|||
Loading…
Reference in New Issue