nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow empty hostname prefix

Browse Source 
In Bremen it has been noted that a prefix may lead people to believe it
has to stay there and thus naming their nodes "ffhb-*", which is not
what the community wants (see FreifunkBremen/gluon-site-ffhb#1).

However, an empty prefix lead to the connecting hyphen still being
inserted. This commit thus makes the hyphen part of the configured
prefix and allows the prefix to be missing from the `site.conf`.
This commit is contained in:
Jan-Philipp Litza 2015-03-21 13:21:49 +01:00
parent 7896f91f86
commit 335026af09
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/gluon-core/check_site.lua
View File

@ -1,7 +1,7 @@
need_string 'site_code' need_string 'site_code'
need_string 'site_name' need_string 'site_name'
need_string 'hostname_prefix' need_string('hostname_prefix', false)
need_string 'timezone' need_string 'timezone'
need_string_array('ntp_servers', false) need_string_array('ntp_servers', false)

2
package/gluon-core/files/lib/gluon/upgrade/030-system
View File

@ -10,7 +10,7 @@ if not sysconfig.gluon_version then
local system = uci:get_first('system', 'system') local system = uci:get_first('system', 'system')
uci:set('system', system, 'hostname', site.hostname_prefix .. '-' .. util.node_id()) uci:set('system', system, 'hostname', (site.hostname_prefix or '') .. util.node_id())
uci:set('system', system, 'timezone', site.timezone) uci:set('system', system, 'timezone', site.timezone)
uci:save('system') uci:save('system')