瀏覽代碼

Allow empty hostname prefix

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`.
Jan-Philipp Litza 9 年之前
父節點
當前提交
335026af09
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      package/gluon-core/check_site.lua
  2. 1 1
      package/gluon-core/files/lib/gluon/upgrade/030-system

+ 1 - 1
package/gluon-core/check_site.lua

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

+ 1 - 1
package/gluon-core/files/lib/gluon/upgrade/030-system

@@ -10,7 +10,7 @@ if not sysconfig.gluon_version then
 
   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:save('system')