gluon-config-mode-contact-info: change "mandatory" site option to "optional"

Also add documentation about config mode settings.
This commit is contained in:
Matthias Schiffer 2018-03-17 12:17:47 +01:00
parent 440cc1ec54
commit 486c2e4821
No known key found for this signature in database
GPG Key ID: 16EF3F64CB201D9C
3 changed files with 34 additions and 2 deletions

View File

@ -366,6 +366,38 @@ autoupdater \: package
All configured mirrors must be reachable from the nodes via IPv6. If you don't want to set an IPv6 address All configured mirrors must be reachable from the nodes via IPv6. If you don't want to set an IPv6 address
explicitly, but use a hostname (which is recommended), see also the :ref:`FAQ <faq-dns>`. explicitly, but use a hostname (which is recommended), see also the :ref:`FAQ <faq-dns>`.
config_mode \: optional
Additional configuration for the configuration web interface. All values are
optional.
By default, no altitude fields are shown by the *gluon-config-mode-geo-location*
package. If *geo_location.show_altitude* is set to *true*, the *gluon-config-mode:altitude-label*
and *gluon-config-mode:altitude-help* strings must be provided in the site i18n
data as well.
The *owner.optional* option can be set to *false* to make the contact
information field mandatory.
The remote login page only shows SSH key configuration by default. A
password form can be displayed by setting *remote_login.show_password_form*
to true; in this case, *remote_login.min_password_length* defines the
minimum password length.
::
config_mode = {
geo_location = {
show_altitude = true,
},
owner = {
optional = false,
},
remote_login = {
show_password_form = true,
min_password_length = 10,
},
},
roles \: optional roles \: optional
Optional role definitions. Nodes will announce their role inside the mesh. Optional role definitions. Nodes will announce their role inside the mesh.
This will allow in the backend to distinguish between normal, backbone and This will allow in the backend to distinguish between normal, backbone and

View File

@ -1 +1 @@
need_boolean(in_site({'config_mode', 'owner', 'obligatory'}), false) need_boolean(in_site({'config_mode', 'owner', 'optional'}), false)

View File

@ -14,7 +14,7 @@ return function(form, uci)
local o = s:option(Value, "contact", pkg_i18n.translate("Contact info"), pkg_i18n.translate("e.g. E-mail or phone number")) local o = s:option(Value, "contact", pkg_i18n.translate("Contact info"), pkg_i18n.translate("e.g. E-mail or phone number"))
o.default = uci:get("gluon-node-info", owner, "contact") o.default = uci:get("gluon-node-info", owner, "contact")
o.optional = not site.config_mode.owner.obligatory(false) o.optional = site.config_mode.owner.optional(true)
-- without a minimal length, an empty string will be accepted even with "optional = false" -- without a minimal length, an empty string will be accepted even with "optional = false"
o.datatype = "minlength(1)" o.datatype = "minlength(1)"
function o:write(data) function o:write(data)