aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/doc_reform/meta/conf_make_meta_yaml.d
diff options
context:
space:
mode:
authorRalph Amissah <ralph.amissah@gmail.com>2021-08-12 13:14:49 -0400
committerRalph Amissah <ralph.amissah@gmail.com>2021-08-20 12:03:17 -0400
commit24269204508d8cf8f963eb9c7d149d18840e4dad (patch)
treec94ac0fdab5496fa4969098604ffcfaa87c18678 /src/doc_reform/meta/conf_make_meta_yaml.d
parentconfiguration reorganized into config files (diff)
config, clean up and make a bit more consistent
- check version settings with: rg -A2 _version_set$ org
Diffstat (limited to 'src/doc_reform/meta/conf_make_meta_yaml.d')
-rw-r--r--src/doc_reform/meta/conf_make_meta_yaml.d45
1 files changed, 22 insertions, 23 deletions
diff --git a/src/doc_reform/meta/conf_make_meta_yaml.d b/src/doc_reform/meta/conf_make_meta_yaml.d
index 3780553..eac55b7 100644
--- a/src/doc_reform/meta/conf_make_meta_yaml.d
+++ b/src/doc_reform/meta/conf_make_meta_yaml.d
@@ -256,11 +256,11 @@ template contentYAMLtoSpineStruct() {
) {
_struct_composite.conf.w_srv_cgi_http = _yaml["webserv"]["cgi_http"].get!string;
}
- if ("domain" in _yaml["webserv"]
- && _yaml["webserv"]["domain"].type.string
- && _yaml["webserv"]["domain"].tag.match(rgx.yaml_tag_is_str)
+ if ("host" in _yaml["webserv"]
+ && _yaml["webserv"]["host"].type.string
+ && _yaml["webserv"]["host"].tag.match(rgx.yaml_tag_is_str)
) {
- _struct_composite.conf.w_srv_domain = _yaml["webserv"]["domain"].get!string;
+ _struct_composite.conf.w_srv_host = _yaml["webserv"]["host"].get!string;
}
// if ("data_root_url" in _yaml["webserv"]
// && _yaml["webserv"]["data_root_url"].type.string
@@ -268,7 +268,7 @@ template contentYAMLtoSpineStruct() {
// ) {
// _struct_composite.conf.w_srv_data_root_url = _yaml["webserv"]["data_root_url"].get!string;
// if (auto m = _struct_composite.conf.w_srv_data_root_url.match(rgx.webserv_url_doc_root)) {
- // _struct_composite.conf.w_srv_url_domain = m.captures[2].to!string;
+ // _struct_composite.conf.w_srv_url_host = m.captures[2].to!string;
// _struct_composite.conf.w_srv_url_doc_path = m.captures[3].to!string;
// }
// }
@@ -306,25 +306,25 @@ template contentYAMLtoSpineStruct() {
~ _manifested.src.language ~ "/"
~ "html";
}
- if ("cgi_domain" in _yaml["webserv"]
- && _yaml["webserv"]["cgi_domain"].type.string
- && _yaml["webserv"]["cgi_domain"].tag.match(rgx.yaml_tag_is_str)
+ if ("cgi_host" in _yaml["webserv"]
+ && _yaml["webserv"]["cgi_host"].type.string
+ && _yaml["webserv"]["cgi_host"].tag.match(rgx.yaml_tag_is_str)
) {
- _struct_composite.conf.w_srv_cgi_domain = _yaml["webserv"]["cgi_domain"].get!string;
+ _struct_composite.conf.w_srv_cgi_host = _yaml["webserv"]["cgi_host"].get!string;
} else { // composite construct
- _struct_composite.conf.w_srv_cgi_domain = _struct_composite.conf.w_srv_domain;
+ _struct_composite.conf.w_srv_cgi_host = _struct_composite.conf.w_srv_host;
}
- if ("cgi_title" in _yaml["webserv"]
- && _yaml["webserv"]["cgi_title"].type.string
- && _yaml["webserv"]["cgi_title"].tag.match(rgx.yaml_tag_is_str)
+ if ("cgi_search_form_title" in _yaml["webserv"]
+ && _yaml["webserv"]["cgi_search_form_title"].type.string
+ && _yaml["webserv"]["cgi_search_form_title"].tag.match(rgx.yaml_tag_is_str)
) {
- _struct_composite.conf.w_srv_cgi_title = _yaml["webserv"]["cgi_title"].get!string;
+ _struct_composite.conf.w_srv_cgi_search_form_title = _yaml["webserv"]["cgi_search_form_title"].get!string;
}
- if ("cgi_bin_part" in _yaml["webserv"]
- && _yaml["webserv"]["cgi_bin_part"].type.string
- && _yaml["webserv"]["cgi_bin_part"].tag.match(rgx.yaml_tag_is_str)
+ if ("cgi_bin_subpath" in _yaml["webserv"]
+ && _yaml["webserv"]["cgi_bin_subpath"].type.string
+ && _yaml["webserv"]["cgi_bin_subpath"].tag.match(rgx.yaml_tag_is_str)
) {
- _struct_composite.conf.w_srv_cgi_bin_part = _yaml["webserv"]["cgi_bin_part"].get!string;
+ _struct_composite.conf.w_srv_cgi_bin_subpath = _yaml["webserv"]["cgi_bin_subpath"].get!string;
}
if ("cgi_bin_path" in _yaml["webserv"]
&& _yaml["webserv"]["cgi_bin_path"].type.string
@@ -390,11 +390,10 @@ template contentYAMLtoSpineStruct() {
? _struct_composite.conf.w_srv_http
:_struct_composite.conf.w_srv_cgi_http
~ "://"
- ~ (_struct_composite.conf.w_srv_cgi_domain.empty)
- ? _struct_composite.conf.w_srv_cgi_domain
- : _struct_composite.conf.w_srv_domain
- ~ "/"
- ~ _struct_composite.conf.w_srv_cgi_bin_part;
+ ~ (_struct_composite.conf.w_srv_cgi_host.empty)
+ ? _struct_composite.conf.w_srv_cgi_host
+ : _struct_composite.conf.w_srv_host
+ ~ _struct_composite.conf.w_srv_cgi_bin_subpath;
}
if (_opt_action.cgi_sqlite_search_filename.length > 0) {
_struct_composite.conf.w_srv_cgi_action = _struct_composite.conf.w_srv_cgi_bin_url ~ "/" ~ _opt_action.cgi_sqlite_search_filename;