aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/doc_reform/meta/conf_make_meta_json.d
diff options
context:
space:
mode:
Diffstat (limited to 'src/doc_reform/meta/conf_make_meta_json.d')
-rw-r--r--src/doc_reform/meta/conf_make_meta_json.d26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/doc_reform/meta/conf_make_meta_json.d b/src/doc_reform/meta/conf_make_meta_json.d
index a6214ce..23b9631 100644
--- a/src/doc_reform/meta/conf_make_meta_json.d
+++ b/src/doc_reform/meta/conf_make_meta_json.d
@@ -199,49 +199,49 @@ static template contentJSONtoSpineStruct() {
}
/+ conf ------------------------------------------------------------------- +/
if ("webserv" in _json.object) {
- if ("url_root" in _json.object["webserv"]
- && (_json.object["webserv"]["url_root"].type().to!string == "string")
+ if ("data_root_url" in _json.object["webserv"]
+ && (_json.object["webserv"]["data_root_url"].type().to!string == "string")
) {
- _struct_composite.conf.webserv_url_doc_root = _json.object["webserv"]["url_root"].str;
- if (auto m = _struct_composite.conf.webserv_url_doc_root.match(rgx.webserv_url_doc_root)) {
- _struct_composite.conf.webserv_url_domain = m.captures[2].to!string;
- _struct_composite.conf.webserv_url_doc_path = m.captures[3].to!string;
+ _struct_composite.conf.w_srv_data_root_url = _json.object["webserv"]["data_root_url"].str;
+ if (auto m = _struct_composite.conf.w_srv_data_root_url.match(rgx.webserv_data_root_url)) {
+ _struct_composite.conf.w_srv_url_domain = m.captures[2].to!string;
+ _struct_composite.conf.w_srv_url_doc_path = m.captures[3].to!string;
}
}
if ("images" in _json.object["webserv"]
&& (_json.object["webserv"]["images"].type().to!string == "string")
) {
- _struct_composite.conf.webserv_images = _json.object["webserv"]["images"].str;
+ _struct_composite.conf.w_srv_images = _json.object["webserv"]["images"].str;
}
if ("cgi" in _json.object["webserv"]
&& (_json.object["webserv"]["cgi"].type().to!string == "string")
) {
- _struct_composite.conf.webserv_cgi = _json.object["webserv"]["cgi"].str;
+ _struct_composite.conf.w_srv_cgi = _json.object["webserv"]["cgi"].str;
}
if ("cgi_host" in _json.object["webserv"]
&& (_json.object["webserv"]["cgi_host"].type().to!string == "string")
) {
- _struct_composite.conf.webserv_cgi_host = _json.object["webserv"]["cgi_host"].str;
+ _struct_composite.conf.w_srv_cgi_host = _json.object["webserv"]["cgi_host"].str;
}
if ("cgi_host_path" in _json.object["webserv"]
&& (_json.object["webserv"]["cgi_host_path"].type().to!string == "string")
) {
- _struct_composite.conf.webserv_cgi_host_path = _json.object["webserv"]["cgi_host_path"].str;
+ _struct_composite.conf.w_srv_cgi_host_path = _json.object["webserv"]["cgi_host_path"].str;
}
if ("cgi_port" in _json.object["webserv"]
&& (_json.object["webserv"]["cgi_port"].type().to!string == "string")
) {
- _struct_composite.conf.webserv_cgi_port = _json.object["webserv"]["cgi_port"].str;
+ _struct_composite.conf.w_srv_cgi_port = _json.object["webserv"]["cgi_port"].str;
}
if ("cgi_user" in _json.object["webserv"]
&& (_json.object["webserv"]["cgi_user"].type().to!string == "string")
) {
- _struct_composite.conf.webserv_cgi_user = _json.object["webserv"]["cgi_user"].str;
+ _struct_composite.conf.w_srv_cgi_user = _json.object["webserv"]["cgi_user"].str;
}
if ("cgi_file_links" in _json.object["webserv"]
&& (_json.object["webserv"]["cgi_file_links"].type().to!string == "string")
) {
- _struct_composite.conf.webserv_cgi_file_links = _json.object["webserv"]["cgi_file_links"].str;
+ _struct_composite.conf.w_srv_cgi_file_links = _json.object["webserv"]["cgi_file_links"].str;
}
}
if ("processing" in _json.object) {