netbird/plugins
0
0
Fork 0
mirror of https://github.com/netbirdio/plugins.git synced 2026-05-22 18:44:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

net/freeradius: empty defaults and whitespace cleanup

Browse Source
This commit is contained in:
Franco Fichtner
2017-11-19 08:33:20 +01:00
parent 85e97e00ae
commit eaf991b775
6 changed files with 70 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Client.xml
+14 -17
View File
@@ -4,23 +4,20 @@
<version>1.0.0</version>
<items>
<clients>
<client type="ArrayField">
<enabled type="BooleanField">
<default>1</default>
<Required>Y</Required>
</enabled>
<name type="TextField">
<default></default>
<Required>Y</Required>
</name>
<secret type="TextField">
<default></default>
<Required>Y</Required>
</secret>
<ip type="TextField">
<default></default>
<Required>N</Required>
</ip>
<client type="ArrayField">
<enabled type="BooleanField">
<default>1</default>
<Required>Y</Required>
</enabled>
<name type="TextField">
<Required>Y</Required>
</name>
<secret type="TextField">
<Required>Y</Required>
</secret>
<ip type="TextField">
<Required>N</Required>
</ip>
</client>
</clients>
</items>
net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/Eap.xml
-3
View File
@@ -19,17 +19,14 @@
<Required>Y</Required>
</enable_client_cert>
<ca type="CertificateField">
<default></default>
<Type>ca</Type>
<Required>N</Required>
</ca>
<certificate type="CertificateField">
<default></default>
<Type>cert</Type>
<Required>N</Required>
</certificate>
<crl type="CertificateField">
<default></default>
<Type>crl</Type>
<Required>N</Required>
</crl>
net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/General.xml
+1 -1
View File
@@ -29,7 +29,7 @@
<OptionValues>
<files>files</files>
<syslog>syslog</syslog>
</OptionValues>
</OptionValues>
</log_destination>
<log_authentication_request type="BooleanField">
<default>0</default>
net/freeradius/src/opnsense/mvc/app/models/OPNsense/Freeradius/User.xml
+50 -63
View File
@@ -4,69 +4,56 @@
<version>1.0.0</version>
<items>
<users>
<user type="ArrayField">
<enabled type="BooleanField">
<default>1</default>
<Required>Y</Required>
</enabled>
<username type="TextField">
<default></default>
<Required>Y</Required>
<mask>/^([0-9a-zA-Z._\-]){1,128}$/u</mask>
</username>
<password type="TextField">
<default></default>
<Required>Y</Required>
<mask>/^([0-9a-zA-Z._\-\!\$\%\/\(\)\+\#\=]){1,128}$/u</mask>
</password>
<description type="TextField">
<default></default>
<Required>N</Required>
</description>
<ip type="TextField">
<default></default>
<Required>N</Required>
<mask>/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/</mask>
</ip>
<subnet type="TextField">
<default></default>
<Required>N</Required>
<mask>/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/</mask>
</subnet>
<vlan type="IntegerField">
<default></default>
<Required>N</Required>
<MinimumValue>1</MinimumValue>
<MaximumValue>4096</MaximumValue>
</vlan>
<wispr_bw_min_up type="IntegerField">
<default></default>
<Required>N</Required>
</wispr_bw_min_up>
<wispr_bw_max_up type="IntegerField">
<default></default>
<Required>N</Required>
</wispr_bw_max_up>
<wispr_bw_min_down type="IntegerField">
<default></default>
<Required>N</Required>
</wispr_bw_min_down>
<wispr_bw_max_down type="IntegerField">
<default></default>
<Required>N</Required>
</wispr_bw_max_down>
<chillispot_bw_max_up type="IntegerField">
<default></default>
<Required>N</Required>
</chillispot_bw_max_up>
<chillispot_bw_max_down type="IntegerField">
<default></default>
<Required>N</Required>
</chillispot_bw_max_down>
<sessionlimit_max_session_limit type="IntegerField">
<default></default>
<Required>N</Required>
</sessionlimit_max_session_limit>
<user type="ArrayField">
<enabled type="BooleanField">
<default>1</default>
<Required>Y</Required>
</enabled>
<username type="TextField">
<Required>Y</Required>
<mask>/^([0-9a-zA-Z._\-]){1,128}$/u</mask>
</username>
<password type="TextField">
<Required>Y</Required>
<mask>/^([0-9a-zA-Z._\-\!\$\%\/\(\)\+\#\=]){1,128}$/u</mask>
</password>
<description type="TextField">
<Required>N</Required>
</description>
<ip type="TextField">
<Required>N</Required>
<mask>/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/</mask>
</ip>
<subnet type="TextField">
<Required>N</Required>
<mask>/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/</mask>
</subnet>
<vlan type="IntegerField">
<Required>N</Required>
<MinimumValue>1</MinimumValue>
<MaximumValue>4096</MaximumValue>
</vlan>
<wispr_bw_min_up type="IntegerField">
<Required>N</Required>
</wispr_bw_min_up>
<wispr_bw_max_up type="IntegerField">
<Required>N</Required>
</wispr_bw_max_up>
<wispr_bw_min_down type="IntegerField">
<Required>N</Required>
</wispr_bw_min_down>
<wispr_bw_max_down type="IntegerField">
<Required>N</Required>
</wispr_bw_max_down>
<chillispot_bw_max_up type="IntegerField">
<Required>N</Required>
</chillispot_bw_max_up>
<chillispot_bw_max_down type="IntegerField">
<Required>N</Required>
</chillispot_bw_max_down>
<sessionlimit_max_session_limit type="IntegerField">
<Required>N</Required>
</sessionlimit_max_session_limit>
</user>
</users>
</items>
net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/radiusd.conf
+2 -2
View File
@@ -42,7 +42,7 @@ log {
{% else %}
auth_badpass = no
{% endif %}
{% if helpers.exists('OPNsense.freeradius.general.log_authgoodpass') and OPNsense.freeradius.general.log_authgoodpass == '1' %}
{% if helpers.exists('OPNsense.freeradius.general.log_authgoodpass') and OPNsense.freeradius.general.log_authgoodpass == '1' %}
auth_goodpass = yes
{% else %}
auth_goodpass = no
@@ -79,7 +79,7 @@ modules {
}
instantiate {
{% if helpers.exists('OPNsense.freeradius.general.sessionlimit') and OPNsense.freeradius.general.sessionlimit == '1' %}
{% if helpers.exists('OPNsense.freeradius.general.sessionlimit') and OPNsense.freeradius.general.sessionlimit == '1' %}
daily
{% endif %}
}
net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/sites-enabled-default
+3 -3
View File
@@ -27,7 +27,7 @@ listen {
type = auth
ipv6addr = ::
port = 0
limit {
max_connections = 16
lifetime = 0
@@ -58,7 +58,7 @@ authorize {
-sql
-ldap
{% if helpers.exists('OPNsense.freeradius.general.sessionlimit') and OPNsense.freeradius.general.sessionlimit == '1' %}
{% if helpers.exists('OPNsense.freeradius.general.sessionlimit') and OPNsense.freeradius.general.sessionlimit == '1' %}
daily
{% endif %}
@@ -92,7 +92,7 @@ preacct {
accounting {
detail
{% if helpers.exists('OPNsense.freeradius.general.sessionlimit') and OPNsense.freeradius.general.sessionlimit == '1' %}
{% if helpers.exists('OPNsense.freeradius.general.sessionlimit') and OPNsense.freeradius.general.sessionlimit == '1' %}
daily
sradutmp
{% endif %}