tyler.durden
/
glass-isc-dhcp
mirror of https://github.com/Akkadius/glass-isc-dhcp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add absolute paths for binaries for cron starts lacking PATH exports to address https://github.com/Akkadius/glass-isc-dhcp/issues/2

This commit is contained in:
Akkadius 2017-10-10 13:00:58 -05:00
parent 0ea0367178
commit 7ac8c91cd1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
routes/dhcp_config_save.js
View File

@ -15,7 +15,7 @@ router.post('/', authorize.auth, function(req, res, next) {
var exec = require('child_process').exec; var exec = require('child_process').exec;
exec('dhcpd -t -cf ./syntax_verify_config > verify_output 2> verify_output', function(err, stdout, stderr) exec('/usr/sbin/dhcpd -t -cf ./syntax_verify_config > verify_output 2> verify_output', function(err, stdout, stderr)
{ {
var output = fs.readFileSync('./verify_output', "utf8"); var output = fs.readFileSync('./verify_output', "utf8");
@ -46,7 +46,7 @@ router.post('/', authorize.auth, function(req, res, next) {
} }
//date +"%Y-%m-%d_%H:%M:%S" //date +"%Y-%m-%d_%H:%M:%S"
exec('cp ' + glass_config.config_file + ' ./config_backups/`basename ' + glass_config.config_file + '`_`date +"%Y-%m-%d_%H:%M:%S"`', exec('/bin/cp ' + glass_config.config_file + ' ./config_backups/`basename ' + glass_config.config_file + '`_`date +"%Y-%m-%d_%H:%M:%S"`',
function(err, stdout, stderr) { function(err, stdout, stderr) {
}); });

4
routes/dhcp_start_stop_restart.js
View File

@ -53,11 +53,11 @@ router.post('/', authorize.auth, function(req, res, next) {
res.send("<script type='text/javascript'>notification('DHCP Server Stopped');ignore_cache = 1;do_pjax_request('/dhcp_start_stop_restart');$('#mdModal').modal('hide');</script>"); res.send("<script type='text/javascript'>notification('DHCP Server Stopped');ignore_cache = 1;do_pjax_request('/dhcp_start_stop_restart');$('#mdModal').modal('hide');</script>");
break; break;
case "start": case "start":
dhcp_exec = execSync('service isc-dhcp-server start'); dhcp_exec = execSync('/usr/sbin/service isc-dhcp-server start');
res.send("<script type='text/javascript'>notification('DHCP Server Started');ignore_cache = 1;do_pjax_request('/dhcp_start_stop_restart');</script>"); res.send("<script type='text/javascript'>notification('DHCP Server Started');ignore_cache = 1;do_pjax_request('/dhcp_start_stop_restart');</script>");
break; break;
case "restart": case "restart":
dhcp_exec = execSync('service isc-dhcp-server restart && sleep 1'); dhcp_exec = execSync('/usr/sbin/service isc-dhcp-server restart && sleep 1');
res.send("<script type='text/javascript'>notification('DHCP Server Restarted " + dhcp_exec + "');ignore_cache = 1;do_pjax_request('/dhcp_start_stop_restart');$('#mdModal').modal('hide');</script>"); res.send("<script type='text/javascript'>notification('DHCP Server Restarted " + dhcp_exec + "');ignore_cache = 1;do_pjax_request('/dhcp_start_stop_restart');$('#mdModal').modal('hide');</script>");
break; break;
default: default: