Skip to content
Snippets Groups Projects
Unverified Commit 6ae067cb authored by Matthias Schiffer's avatar Matthias Schiffer
Browse files

gluon-core: add domain aliases and pretty name


Based-on-patch-by: default avatarlemoer <git@irrelefant.net>
parent 2ef0af5f
No related branches found
No related tags found
No related merge requests found
...@@ -13,6 +13,12 @@ if this_domain() then ...@@ -13,6 +13,12 @@ if this_domain() then
end, nil, 'be a valid domain name') end, nil, 'be a valid domain name')
end end
need_domain_name(in_site({'default_domain'})) need_domain_name(in_site({'default_domain'}))
need_table(in_domain({'domain_names'}), function(domain)
need_alphanumeric_key(domain)
need_string(domain)
end)
need_string(in_domain({'domain_names', this_domain()}))
end end
need_string_match(in_domain({'domain_seed'}), '^' .. ('%x'):rep(64) .. '$') need_string_match(in_domain({'domain_seed'}), '^' .. ('%x'):rep(64) .. '$')
......
...@@ -53,9 +53,15 @@ define Build/Compile ...@@ -53,9 +53,15 @@ define Build/Compile
$(call GenerateJSON,site) $(call GenerateJSON,site)
ifdef CONFIG_GLUON_MULTIDOMAIN ifdef CONFIG_GLUON_MULTIDOMAIN
rm -rf $(PKG_BUILD_DIR)/domains
mkdir -p $(PKG_BUILD_DIR)/domains mkdir -p $(PKG_BUILD_DIR)/domains
$(foreach domain,$(patsubst $(GLUON_SITEDIR)/domains/%.conf,%,$(wildcard $(GLUON_SITEDIR)/domains/*.conf)), $(foreach domain,$(patsubst $(GLUON_SITEDIR)/domains/%.conf,%,$(wildcard $(GLUON_SITEDIR)/domains/*.conf)),
[ ! -e '$(PKG_BUILD_DIR)/domains/$(domain).json' ]
$(call GenerateJSON,domains/$(domain)) $(call GenerateJSON,domains/$(domain))
lua ../../scripts/domain_aliases.lua '$(PKG_BUILD_DIR)/domains/$(domain).json' | while read alias; do \
[ "$$$${alias}" != '$(domain)' ] || continue; \
ln -s '$(domain).json' $(PKG_BUILD_DIR)/domains/$$$${alias}.json || exit 1; \
done
) )
endif endif
......
local cjson = require 'cjson'
local function load_json(filename)
local f = assert(io.open(filename))
local json = cjson.decode(f:read('*a'))
f:close()
return json
end
local domain = load_json(arg[1])
for k, _ in pairs(domain.domain_names) do
print(k)
end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment