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 w/ file_move_config + permissions

Browse Source
This commit is contained in:
billz 2021-02-07 11:54:57 +00:00
parent ef09dd0f60
commit f48e77da6c
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
includes/openvpn.php
View File

@ -51,6 +51,7 @@ function DisplayOpenVPNConfig()
$authUser = current($auth); $authUser = current($auth);
$authPassword = next($auth); $authPassword = next($auth);
} }
$clients = preg_grep('~\login.(conf)$~', scandir(pathinfo(RASPI_OPENVPN_CLIENT_LOGIN, PATHINFO_DIRNAME)));
echo renderTemplate( echo renderTemplate(
"openvpn", compact( "openvpn", compact(
@ -59,7 +60,8 @@ function DisplayOpenVPNConfig()
"openvpnstatus", "openvpnstatus",
"public_ip", "public_ip",
"authUser", "authUser",
"authPassword" "authPassword",
"clients"
) )
); );
} }
@ -147,6 +149,8 @@ function SaveOpenVPNConfig($status, $file, $authUser, $authPassword)
$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);
file_prepend_data($tmp_authdata, $prepend); file_prepend_data($tmp_authdata, $prepend);
file_move_config(RASPI_OPENVPN_CLIENT_LOGIN);
chmod($tmp_authdata, 0644);
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('Unable to save client auth credentials', 'danger'); $status->addMessage('Unable to save client auth credentials', 'danger');
@ -163,6 +167,8 @@ function SaveOpenVPNConfig($status, $file, $authUser, $authPassword)
} }
// Copy tmp client config to /etc/openvpn/client // Copy tmp client config to /etc/openvpn/client
file_move_config(RASPI_OPENVPN_CLIENT_CONFIG);
chmod($tmp_ovpnclient, 0644);
system("sudo cp $tmp_ovpnclient " . RASPI_OPENVPN_CLIENT_CONFIG, $return); system("sudo cp $tmp_ovpnclient " . RASPI_OPENVPN_CLIENT_CONFIG, $return);
if ($return ==0) { if ($return ==0) {
$status->addMessage('OpenVPN client.conf uploaded successfully', 'info'); $status->addMessage('OpenVPN client.conf uploaded successfully', 'info');