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

Merge branch 'zbchristian-mods-openvpn' of https://github.com/RaspAP/raspap-insiders into zbchristian-mods-openvpn

Browse Source
This commit is contained in:
billz 2021-04-05 10:02:49 +01:00
commit bb0fa69985
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ajax/openvpn/activate_ovpncfg.php
View File

@ -5,11 +5,11 @@ require_once '../../includes/functions.php';
if (isset($_POST['cfg_id'])) { if (isset($_POST['cfg_id'])) {
$ovpncfg_id = $_POST['cfg_id']; $ovpncfg_id = $_POST['cfg_id'];
$ovpncfg_path = pathinfo(RASPI_OPENVPN_CLIENT_LOGIN, PATHINFO_DIRNAME).'/'; $ovpncfg_path = pathinfo(RASPI_OPENVPN_CLIENT_CONFIG, PATHINFO_DIRNAME).'/';
$ovpncfg_files = $ovpncfg_path .$ovpncfg_id.'_*.conf'; $ovpncfg_files = $ovpncfg_path .$ovpncfg_id.'_*.conf';
// move currently active profile // move currently active profile
$meta = file_get_meta(RASPI_OPENVPN_CLIENT_LOGIN,'#\sfilename\s(.*)'); $meta = file_get_meta(RASPI_OPENVPN_CLIENT_CONFIG,'#\sfilename\s(.*)');
$ovpncfg_client = $ovpncfg_path .$meta.'_client.conf'; $ovpncfg_client = $ovpncfg_path .$meta.'_client.conf';
$ovpncfg_login = $ovpncfg_path .$meta.'_login.conf'; $ovpncfg_login = $ovpncfg_path .$meta.'_login.conf';
exec("sudo mv ".RASPI_OPENVPN_CLIENT_CONFIG." $ovpncfg_client", $return); exec("sudo mv ".RASPI_OPENVPN_CLIENT_CONFIG." $ovpncfg_client", $return);

3
templates/openvpn/general.php
View File

@ -37,9 +37,8 @@
<div class="panel panel-default panel-collapse collapse in" id="PanelCerts" > <div class="panel panel-default panel-collapse collapse in" id="PanelCerts" >
<div class="panel-body"> <div class="panel-body">
<div class="panel-heading"> <div class="panel-heading">
<h5 class="panel-title">Enter username and password</h5>
</div>
<h5 class="panel-title">Certificates in the configuration file</h5> <h5 class="panel-title">Certificates in the configuration file</h5>
</div>
<p> RaspAP does not support the import of the required cerficates. Please paste them into the configuration file <p> RaspAP does not support the import of the required cerficates. Please paste them into the configuration file
<ul> <ul>
<li>Signing certification authority (CA) certificate (e.g. <code>ca.crt</code>): enclosed in <code>&lt;ca> ... &lt;/ca></code> tags </li> <li>Signing certification authority (CA) certificate (e.g. <code>ca.crt</code>): enclosed in <code>&lt;ca> ... &lt;/ca></code> tags </li>