Merge branch 'feature/configpage'
This commit is contained in:
commit
c68a86e90a
GPG Key ID:
28CCCB8F62BFADD6
|
|
@ -0,0 +1,73 @@
|
|||
<?php
|
||||
|
||||
/*
|
||||
* The MIT License
|
||||
*
|
||||
* Copyright 2017-2018 Jeroen De Meerleer <me@jeroened.be>.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantia²l portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
require_once "include/initialize.inc.php";
|
||||
|
||||
if ($_SERVER["REQUEST_METHOD"] == "GET") {
|
||||
|
||||
$message = "";
|
||||
if (isset($_GET["message"])) {
|
||||
switch ($_GET["message"]) {
|
||||
case "edited":
|
||||
$message = "The config has been edited"; break;
|
||||
}
|
||||
}
|
||||
|
||||
$error = "";
|
||||
if (isset($_GET["error"])) {
|
||||
switch ($_GET["error"]) {
|
||||
case "emptyfields":
|
||||
$error = "Some fields were empty"; break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$loader = new Twig_Loader_Filesystem('templates');
|
||||
$twig = new Twig_Environment($loader, array('cache' => 'cache', "debug" => true));
|
||||
|
||||
$configs = load_config_categorized();
|
||||
|
||||
$twig_vars = array('config' => $configs, "error" => $error, "message" => $message);
|
||||
|
||||
echo $twig->render('config.html.twig', $twig_vars);
|
||||
}
|
||||
elseif ($_SERVER["REQUEST_METHOD"] == "POST") {
|
||||
|
||||
foreach($_POST as $key => $value) {
|
||||
if (empty($value)) {
|
||||
header("location:config.php?error=emptyfields"); exit;
|
||||
}
|
||||
|
||||
$keydb = str_replace('_', '.', $key);
|
||||
$stmt = $db->prepare("UPDATE config SET value = ? WHERE conf = ?");
|
||||
$stmt->execute(array($value, $keydb));
|
||||
}
|
||||
|
||||
header("location:config.php?message=edited");
|
||||
exit;
|
||||
}
|
||||
|
||||
require_once 'include/finalize.inc.php';
|
||||
55
database.sql
55
database.sql
|
|
@ -1,23 +1,15 @@
|
|||
-- phpMyAdmin SQL Dump
|
||||
-- version 4.7.0
|
||||
-- version 4.6.6deb5
|
||||
-- https://www.phpmyadmin.net/
|
||||
--
|
||||
-- Host: localhost
|
||||
-- Gegenereerd op: 15 apr 2017 om 06:49
|
||||
-- Serverversie: 5.5.52-MariaDB
|
||||
-- PHP-versie: 7.1.4
|
||||
-- Generation Time: Sep 12, 2018 at 12:23 PM
|
||||
-- Server version: 10.1.34-MariaDB-0ubuntu0.18.04.1
|
||||
-- PHP Version: 5.6.37-1+ubuntu18.04.1+deb.sury.org+1
|
||||
|
||||
SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
|
||||
SET AUTOCOMMIT = 0;
|
||||
START TRANSACTION;
|
||||
SET time_zone = "+00:00";
|
||||
|
||||
|
||||
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
|
||||
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
|
||||
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
|
||||
/*!40101 SET NAMES utf8mb4 */;
|
||||
|
||||
--
|
||||
-- Database: `jeroened_webcron`
|
||||
--
|
||||
|
|
@ -25,7 +17,32 @@ SET time_zone = "+00:00";
|
|||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Tabelstructuur voor tabel `jobs`
|
||||
-- Table structure for table `config`
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `config`;
|
||||
CREATE TABLE IF NOT EXISTS `config` (
|
||||
`conf` varchar(100) NOT NULL,
|
||||
`category` varchar(50) NOT NULL,
|
||||
`type` varchar(50) NOT NULL,
|
||||
`label` text NOT NULL,
|
||||
`description` text NOT NULL,
|
||||
`value` varchar(100) NOT NULL,
|
||||
PRIMARY KEY (`conf`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
--
|
||||
-- Dumping data for table `config`
|
||||
--
|
||||
|
||||
INSERT INTO `config` (`conf`, `category`, `type`, `label`, `description`, `value`) VALUES
|
||||
('dbclean.expireruns', 'Database Cleanup', 'number(0,-1)', 'Retention value', 'How many days does the database keep the runs', '30'),
|
||||
('jobs.reboottime', 'Jobs', 'number(0,30)', 'Reboot delay', 'The amount of delay in minutes between scheduling a reboot and the actual reboot', '5');
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Table structure for table `jobs`
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `jobs`;
|
||||
|
|
@ -34,16 +51,17 @@ CREATE TABLE IF NOT EXISTS `jobs` (
|
|||
`user` int(11) NOT NULL,
|
||||
`name` text NOT NULL,
|
||||
`url` text NOT NULL,
|
||||
`host` varchar(50) NOT NULL DEFAULT 'localhost',
|
||||
`delay` int(11) NOT NULL,
|
||||
`expected` int(11) NOT NULL,
|
||||
`nextrun` int(11) NOT NULL,
|
||||
`expected` int(11) NOT NULL DEFAULT '200',
|
||||
PRIMARY KEY (`jobID`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Tabelstructuur voor tabel `runs`
|
||||
-- Table structure for table `runs`
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `runs`;
|
||||
|
|
@ -59,7 +77,7 @@ CREATE TABLE IF NOT EXISTS `runs` (
|
|||
-- --------------------------------------------------------
|
||||
|
||||
--
|
||||
-- Tabelstructuur voor tabel `users`
|
||||
-- Table structure for table `users`
|
||||
--
|
||||
|
||||
DROP TABLE IF EXISTS `users`;
|
||||
|
|
@ -71,8 +89,3 @@ CREATE TABLE IF NOT EXISTS `users` (
|
|||
`autologin` text NOT NULL,
|
||||
PRIMARY KEY (`userID`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
COMMIT;
|
||||
|
||||
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
|
||||
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
|
||||
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
|
||||
|
|
|
|||
|
|
@ -30,4 +30,70 @@ function job_in_array($id, $jobs) {
|
|||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
function load_config_categorized() {
|
||||
global $db;
|
||||
|
||||
$allConfig = $db->prepare("SELECT * FROM config ORDER BY category ASC");
|
||||
$allConfig->execute();
|
||||
$allConfigResult = $allConfig->fetchAll(PDO::FETCH_ASSOC);
|
||||
|
||||
// Separate lines into categories
|
||||
$configCategorized = array();
|
||||
$count = 0;
|
||||
foreach($allConfigResult as $key=>$value) {
|
||||
$configCategorized[$value['category']][$count]['conf'] = $value['conf'];
|
||||
$configCategorized[$value['category']][$count]['value'] = $value['value'];
|
||||
$configCategorized[$value['category']][$count]['label'] = $value['label'];
|
||||
$configCategorized[$value['category']][$count]['description'] = $value['description'];
|
||||
$configCategorized[$value['category']][$count]['type'] = parse_config_type($value['type']);
|
||||
$count++;
|
||||
}
|
||||
|
||||
// into a easy twig array
|
||||
$catcount = 0;
|
||||
foreach ($configCategorized as $key => $value) {
|
||||
$twigarray[$catcount]['name'] = $key;
|
||||
$twigarray[$catcount]['conf'] = $value;
|
||||
$catcount++;
|
||||
}
|
||||
|
||||
return $twigarray;
|
||||
}
|
||||
|
||||
function get_configvalue($conf) {
|
||||
global $db;
|
||||
|
||||
$config = $db->prepare("SELECT value FROM config WHERE conf = ?");
|
||||
$config->execute(array($conf));
|
||||
$configResult = $config->fetch(PDO::FETCH_ASSOC);
|
||||
|
||||
return $configResult['value'];
|
||||
|
||||
}
|
||||
|
||||
function parse_config_type($type) {
|
||||
$splittype = explode('(', substr($type, 0, -1));
|
||||
|
||||
$r_var['type'] = $splittype[0];
|
||||
$splitargs = explode(',', $splittype[1]);
|
||||
|
||||
switch($r_var['type'])
|
||||
{
|
||||
case 'number':
|
||||
$r_var['args'][] = $splitargs[0] != '-1' ? 'min="' . $splitargs[0] . '"' : '';
|
||||
$r_var['args'][] = $splitargs[1] != '-1' ? 'max="' . $splitargs[1] . '"' : '';
|
||||
break;
|
||||
}
|
||||
return $r_var;
|
||||
}
|
||||
|
||||
function clean_database() {
|
||||
global $db;
|
||||
|
||||
$oldestrun = time() - (60 * 60 * 24 * get_configvalue('dbclean.expireruns'));
|
||||
|
||||
$stmt = $db->prepare("DELETE FROM runs WHERE timestamp < ?");
|
||||
$stmt->execute(array($oldestrun));
|
||||
}
|
||||
|
|
@ -26,11 +26,11 @@
|
|||
|
||||
session_start();
|
||||
|
||||
require_once "include/functions.php";
|
||||
|
||||
error_reporting("E_ALL");
|
||||
error_reporting(E_ALL);
|
||||
ini_set("display_errors", "on");
|
||||
|
||||
require_once "include/functions.php";
|
||||
|
||||
if( ini_get('safe_mode') ){
|
||||
die("Cannot run in safe mode");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,8 +38,8 @@ if (isset($_GET['action'])) {
|
|||
}
|
||||
}
|
||||
|
||||
$message = "";
|
||||
if ($_GET["message"]) {
|
||||
if (isset($_GET["message"])) {
|
||||
$message = "";
|
||||
switch ($_GET["message"]) {
|
||||
case "edited":
|
||||
$message = "The cronjob has been edited"; break;
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@
|
|||
<ul class="nav nav-stacked">
|
||||
<li><a href="overview.php">Overview</a></li>
|
||||
<li><a href="addjob.php">Add a new cronjob</a></li>
|
||||
<li><a href="config.php">Configuration</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,30 @@
|
|||
{% extends "base.html.twig" %}
|
||||
{% block title %}configuration{% endblock %}
|
||||
{% block content %}
|
||||
<h2>Webcron configuration</h2>
|
||||
{% if not message == "" %}
|
||||
<div class="alert alert-success fade in">
|
||||
<a href="#" class="close" data-dismiss="alert">×</a>
|
||||
{{ message }}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if not error == "" %}
|
||||
<div class="alert alert-danger fade in">
|
||||
<a href="#" class="close" data-dismiss="alert">×</a>
|
||||
<strong>Error!</strong> {{ error }}
|
||||
</div>
|
||||
{% endif %}
|
||||
<form method="post" action="config.php">
|
||||
{% for cat in config %}
|
||||
<h3>{{ cat.name }}</h3>
|
||||
{% for confval in cat.conf %}
|
||||
<div class="form-group">
|
||||
<p><label for="{{ confval.conf }}">{{ confval.label }}</label><p>
|
||||
<p><input class="form-control" id="{{ confval.conf }}" name="{{ confval.conf }}" type="{{ confval.type.type }}"{% for args in confval.type.args %} {{ args | raw }}{% endfor %}value="{{ confval.value }}">
|
||||
<p class="description">{{ confval.description }}</p>
|
||||
</div>
|
||||
{% endfor %}
|
||||
{% endfor %}
|
||||
<button type="submit" class="btn btn-default">Submit</button>
|
||||
</form>
|
||||
{% endblock %}
|
||||
|
|
@ -105,17 +105,19 @@ foreach ($results as $result) {
|
|||
$nosave = false;
|
||||
}
|
||||
|
||||
clean_database();
|
||||
|
||||
unlink('/tmp/webcron.lock');
|
||||
|
||||
if(file_exists("cache/reboot.trigger")) {
|
||||
unlink("cache/reboot.trigger");
|
||||
$rebootser = serialize($rebootjobs);
|
||||
file_put_contents("cache/get-services.trigger", $rebootser);
|
||||
file_put_contents("cache/reboot-time.trigger", time() + (5 * 60));
|
||||
file_put_contents("cache/reboot-time.trigger", time() + (get_configvalue('jobs.reboottime') * 60));
|
||||
$rebooted_hosts = array();
|
||||
foreach($rebootjobs as $job) {
|
||||
|
||||
$url = "ssh " . $job['host'] . " '" . 'sudo shutdown -r +5 "A reboot has been scheduled. Please save your work."' . "'";
|
||||
$url = "ssh " . $job['host'] . " '" . 'sudo shutdown -r +' . get_configvalue('jobs.reboottime') . ' "A reboot has been scheduled. Please save your work."' . "'";
|
||||
exec($url);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue