upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-06-04 22:33:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

security/tinc: fixes from master

Browse source
This commit is contained in:
Franco Fichtner 2017-05-17 06:23:47 +02:00
parent 23376feb62
commit c6edd140ec
5 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
security/tinc/Makefile
View file

@ -1,5 +1,6 @@
PLUGIN_NAME= tinc
PLUGIN_VERSION= 1.2
PLUGIN_REVISION= 1
PLUGIN_COMMENT= Tinc VPN
PLUGIN_DEPENDS= tinc
PLUGIN_MAINTAINER= ad@opnsense.org

18
security/tinc/src/etc/rc.d/opnsense-tincd
View file

@ -2,32 +2,32 @@
#
# $FreeBSD$
#
# PROVIDE: tincd
# PROVIDE: opnsense-tincd
# REQUIRE: SERVERS
# KEYWORD: shutdown
#
. /etc/rc.subr
name=opnsense-tincd
name=ostincd
stop_cmd=tincd_stop
start_cmd=tincd_start
rcvar=OPNtincd_enable
stop_cmd=ostincd_stop
start_cmd=ostincd_start
rcvar=ostincd_enable
load_rc_config $name
load_rc_config opnsense-tincd
[ -z "$OPNtincd_enable" ] && OPNtincd_enable="NO"
[ -z "$ostincd_enable" ] && ostincd_enable="NO"
# stop tincd
tincd_stop()
ostincd_stop()
{
echo "stopping tincd"
/usr/local/opnsense/scripts/OPNsense/Tinc/tincd.py stop
}
# start tincd
tincd_start()
ostincd_start()
{
echo "starting tincd"
/usr/local/opnsense/scripts/OPNsense/Tinc/tincd.py start

2
security/tinc/src/opnsense/mvc/app/models/OPNsense/Tinc/Tinc.xml
View file

@ -99,7 +99,7 @@
<display>name</display>
</hosts>
</Model>
<ValidationMessage>Related pipe or queue not found</ValidationMessage>
<ValidationMessage>Related network not found</ValidationMessage>
<Required>Y</Required>
</network>
<hostname type="TextField">

8
security/tinc/src/opnsense/mvc/app/views/OPNsense/Tinc/index.volt
View file

@ -97,10 +97,10 @@ POSSIBILITY OF SUCH DAMAGE.
<thead>
<tr>
<th data-column-id="enabled" data-width="6em" data-type="string" data-formatter="rowtoggle">{{ lang._('Enabled') }}</th>
<th data-column-id="id" data-type="number" data-visible="false">{{ lang._('ID') }}</th>
<th data-column-id="id" data-type="number" data-visible="false">{{ lang._('ID') }}</th>
<th data-column-id="name" data-type="string">{{ lang._('Name') }}</th>
<th data-column-id="commands" data-width="7em" data-formatter="commands" data-sortable="false">{{ lang._('Commands') }}</th>
<th data-column-id="uuid" data-type="string" data-identifier="true" data-visible="false">{{ lang._('ID') }}</th>
<th data-column-id="uuid" data-type="string" data-identifier="true" data-visible="false">{{ lang._('ID') }}</th>
</tr>
</thead>
<tbody>
@ -126,7 +126,7 @@ POSSIBILITY OF SUCH DAMAGE.
<th data-column-id="network" data-type="string">{{ lang._('Network') }}</th>
<th data-column-id="hostname" data-type="string">{{ lang._('Hostname') }}</th>
<th data-column-id="commands" data-width="7em" data-formatter="commands" data-sortable="false">{{ lang._('Commands') }}</th>
<th data-column-id="uuid" data-type="string" data-identifier="true" data-visible="false">{{ lang._('ID') }}</th>
<th data-column-id="uuid" data-type="string" data-identifier="true" data-visible="false">{{ lang._('ID') }}</th>
</tr>
</thead>
<tbody>
@ -146,7 +146,7 @@ POSSIBILITY OF SUCH DAMAGE.
</div>
<div class="col-md-12">
<hr/>
<button class="btn btn-primary" id="reconfigureAct" type="button"><b>{{ lang._('Apply') }}</b><i id="reconfigureAct_progress" class=""></i></button>
<button class="btn btn-primary" id="reconfigureAct" type="button"><b>{{ lang._('Apply') }}</b> <i id="reconfigureAct_progress" class=""></i></button>
<br/><br/>
</div>
</div>

4
security/tinc/src/opnsense/service/templates/OPNsense/Tinc/rc.conf.d
View file

@ -5,7 +5,7 @@
{% endif %}
{% endfor %}
{% if networks|length > 0 %}
OPNtincd_enable=YES
ostincd_enable=YES
{% else %}
OPNtincd_enable=NO
ostincd_enable=NO
{% endif %}