lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-19 19:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

openvpn: restart single instance by id

Browse Source 
This looks a bit odd when we have the full struct and pass it down,
but is way easier to maintain than to tell the underlying code
this is a server or a client or whatever, because it shouldn't
matter as the vpnid is unique anyway.
This commit is contained in:
Franco Fichtner 2017-03-22 08:45:45 +01:00
parent aff94b55a3
commit b521b24ce0
4 changed files with 24 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/etc/inc/plugins.inc.d/openvpn.inc
View File

@ -63,12 +63,11 @@ function openvpn_services()
$pconfig = array();
$pconfig['description'] = "OpenVPN {$mode}: " . htmlspecialchars($setting['description']);
$pconfig['pidfile'] = "/var/run/openvpn_{$mode}{$setting['vpnid']}.pid";
$pconfig['php']['restart'] = array('openvpn_restart_by_id');
$pconfig['php']['start'] = array('openvpn_restart_by_id');
$pconfig['php']['args'] = array('mode', 'id');
$pconfig['php']['restart'] = array('openvpn_configure_single');
$pconfig['php']['start'] = array('openvpn_configure_single');
$pconfig['php']['args'] = array('id');
$pconfig['id'] = $setting['vpnid'];
$pconfig['name'] = 'openvpn';
$pconfig['mode'] = $mode;
$services[] = $pconfig;
}
}
@ -912,28 +911,6 @@ function openvpn_reconfigure($mode, $settings, $device_only = false)
@chmod("/var/etc/openvpn/{$mode_id}.conf", 0600);
}
function openvpn_restart_by_id($mode, $id)
{
global $config;
$found = null;
if (isset($config['openvpn']["openvpn-$mode"])) {
foreach ($config['openvpn']["openvpn-$mode"] as $settings) {
if ($id != 0 && $id == $settings['vpnid']) {
$found = $settings;
break;
}
}
}
if ($found == null) {
return;
}
openvpn_restart($mode, $found);
}
function openvpn_restart($mode, $settings)
{
global $config;
@ -971,7 +948,7 @@ function openvpn_restart($mode, $settings)
}
}
function openvpn_delete($mode, & $settings)
function openvpn_delete($mode, &$settings)
{
global $config;
@ -1152,7 +1129,8 @@ function openvpn_configure_interface($interface)
foreach ($config['openvpn']['openvpn-server'] as $server) {
if ($interface == "ovpns{$server['vpnid']}") {
log_error("OpenVPN: Resync server {$server['description']}");
openvpn_configure_server($server);
openvpn_reconfigure('server', $server);
openvpn_restart('server', $server);
}
}
unset($server);
@ -1162,7 +1140,8 @@ function openvpn_configure_interface($interface)
foreach ($config['openvpn']['openvpn-client'] as $client) {
if ($interface == "ovpnc{$client['vpnid']}") {
log_error("OpenVPN: Resync server {$client['description']}");
openvpn_configure_client($client);
openvpn_reconfigure('client', $client);
openvpn_restart('client', $client);
}
}
unset($client);
@ -1170,16 +1149,19 @@ function openvpn_configure_interface($interface)
}
}
function openvpn_configure_client($settings)
function openvpn_configure_single($id)
{
openvpn_reconfigure('client', $settings);
openvpn_restart('client', $settings);
}
global $config;
function openvpn_configure_server($settings)
{
openvpn_reconfigure('server', $settings);
openvpn_restart('server', $settings);
foreach (array('server', 'client') as $mode) {
if (isset($config['openvpn']["openvpn-{$mode}"])) {
foreach ($config['openvpn']["openvpn-{$mode}"] as &$settings) {
openvpn_reconfigure($mode, $settings);
openvpn_restart($mode, $settings);
return;
}
}
}
}
function openvpn_configure_do($verbose = false, $interface = '')

2
src/etc/inc/plugins.inc.d/openvpn/wizard.inc
View File

@ -733,7 +733,7 @@ function step12_submitphpaction()
write_config();
openvpn_configure_server($server);
openvpn_configure_single($server['vpnid']);
openvpn_configure_csc();
header(url_safe('Location: /vpn_openvpn_server.php'));

4
src/www/vpn_openvpn_client.php
View File

@ -168,7 +168,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$a_client[$id]['disable'] = true;
}
write_config();
openvpn_configure_client($a_client[$id]);
openvpn_configure_single($a_client[$id]['vpnid']);
}
header(url_safe('Location: /vpn_openvpn_client.php'));
exit;
@ -337,7 +337,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
write_config();
openvpn_configure_client($client);
openvpn_configure_single($client['vpnid']);
header(url_safe('Location: /vpn_openvpn_client.php'));
exit;

4
src/www/vpn_openvpn_server.php
View File

@ -150,7 +150,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
$a_server[$id]['disable'] = true;
}
write_config();
openvpn_configure_server($a_server[$id]);
openvpn_configure_single($a_server[$id]['vpnid']);
}
header(url_safe('Location: /vpn_openvpn_server.php'));
exit;
@ -403,7 +403,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
write_config();
openvpn_configure_server($server);
openvpn_configure_single($server['vpnid']);
openvpn_configure_csc();
header(url_safe('Location: /vpn_openvpn_server.php'));