frodovdr/raspap-webgui
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2023-10-10 13:37:24 +02:00
Code Issues Releases Wiki Activity

Update tmp paths, parameterize control script

Browse Source
This commit is contained in:
billz 2019-11-17 10:16:10 +00:00
parent 844182f704
commit 5ddad7e39c
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
includes/openvpn.php Normal file → Executable file
View File

@ -77,6 +77,8 @@ function DisplayOpenVPNConfig()
*/ */
function SaveOpenVPNConfig($status, $file, $authUser, $authPassword) function SaveOpenVPNConfig($status, $file, $authUser, $authPassword)
{ {
$tmp_ovpnclient = '/tmp/ovpnclient.ovpn';
$tmp_authdata = '/tmp/authdata';
try { try {
// If undefined or multiple files, treat as invalid // If undefined or multiple files, treat as invalid
@ -133,17 +135,17 @@ function SaveOpenVPNConfig($status, $file, $authUser, $authPassword)
throw new RuntimeException('Unable to move uploaded file'); throw new RuntimeException('Unable to move uploaded file');
} }
// Good upload, update /tmp client conf with auth-user-pass // Good upload, update /tmp client conf with auth-user-pass
exec('sudo /etc/raspap/openvpn/configauth.sh', $return); exec("sudo /etc/raspap/openvpn/configauth.sh $tmp_ovpnclient " .RASPI_WIFI_CLIENT_INTERFACE, $return);
foreach ($return as $line) { foreach ($return as $line) {
$status->addMessage($line, 'info'); $status->addMessage($line, 'info');
} }
// Copy /tmp file to /etc/openvpn // Copy tmp client config to /etc/openvpn
system('sudo cp /tmp/ovpnclient.ovpn ' . RASPI_OPENVPN_CLIENT_CONFIG, $return); system("sudo cp $tmp_ovpnclient " . RASPI_OPENVPN_CLIENT_CONFIG, $return);
// Copy /tmp/authdata to /etc/openvpn/login.conf // Copy tmp authdata to /etc/openvpn/login.conf
$auth = $authUser .PHP_EOL . $authPassword .PHP_EOL; $auth = $authUser .PHP_EOL . $authPassword .PHP_EOL;
file_put_contents("/tmp/authdata", $auth); file_put_contents($tmp_authdata, $auth);
system('sudo cp /tmp/authdata ' . RASPI_OPENVPN_CLIENT_LOGIN, $return); system("sudo cp $tmp_authdata " . RASPI_OPENVPN_CLIENT_LOGIN, $return);
if ($return ==0) { if ($return ==0) {
$status->addMessage('OpenVPN .conf file uploaded successfully', 'info'); $status->addMessage('OpenVPN .conf file uploaded successfully', 'info');