upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-05-28 04:34:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

net/wireguard: 0.3

Browse source
This commit is contained in:
Franco Fichtner 2018-09-04 12:14:13 +02:00
parent 3ff493ec12
commit e2fc6abe17
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/wireguard/Makefile
View file

@ -1,5 +1,5 @@
PLUGIN_NAME= wireguard
PLUGIN_VERSION= 0.2
PLUGIN_VERSION= 0.3
PLUGIN_COMMENT= WireGuard VPN service
PLUGIN_DEPENDS= wireguard
PLUGIN_MAINTAINER= m.muenz@gmail.com

2
net/wireguard/src/etc/rc.d/opnsense-wireguard
View file

@ -38,7 +38,7 @@ wireguard_start()
echo "starting wireguard"
for STARTER in ${wireguard_config}; do
$command up $STARTER
ifconfig $STARTER group wireguard
ifconfig $STARTER group wg
done
}

4
net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/Api/ServerController.php
View file

@ -55,7 +55,7 @@ class ServerController extends ApiMutableModelControllerBase
$node = $this->getModel()->servers->server->Add();
}
$node->setNodes($this->request->getPost("server"));
if (empty((string)$node->pubkey) || empty((string)$node->privkey)) {
if (empty((string)$node->pubkey) && empty((string)$node->privkey)) {
// generate new keypair
$backend = new Backend();
$keyspriv = $backend->configdpRun("wireguard genkey", 'private');
@ -80,7 +80,7 @@ class ServerController extends ApiMutableModelControllerBase
$node = $this->getModel()->servers->server->Add();
}
$node->setNodes($this->request->getPost("server"));
if (empty((string)$node->pubkey) || empty((string)$node->privkey)) {
if (empty((string)$node->pubkey) && empty((string)$node->privkey)) {
// generate new keypair
$backend = new Backend();
$keyspriv = $backend->configdpRun("wireguard genkey", 'private');

4
net/wireguard/src/opnsense/mvc/app/controllers/OPNsense/Wireguard/forms/dialogEditWireguardServer.xml
View file

@ -20,13 +20,13 @@
<field>
<id>server.pubkey</id>
<label>Public Key</label>
<type>info</type>
<type>text</type>
<help>Public key of this instance. After saving you will see here your public key.</help>
</field>
<field>
<id>server.privkey</id>
<label>Private Key</label>
<type>info</type>
<type>text</type>
<help>Private key of this instance. After saving you will see here your public key, please keep it safe.</help>
</field>
<field>

4
net/wireguard/src/opnsense/mvc/app/models/OPNsense/Wireguard/Client.xml
View file

@ -1,7 +1,7 @@
<model>
<mount>//OPNsense/wireguard/client</mount>
<description>Wireguard Client configuration</description>
<version>0.0.2</version>
<version>0.0.3</version>
<items>
<clients>
<client type="ArrayField">
@ -24,7 +24,7 @@
<Required>Y</Required>
<asList>Y</asList>
</tunneladdress>
<serveraddress type="NetworkField">
<serveraddress type="HostnameField">
<Required>N</Required>
</serveraddress>
<serverport type="PortField">