diff options
Diffstat (limited to 'src/doc_reform/meta')
| -rw-r--r-- | src/doc_reform/meta/conf_make_meta_json.d | 2 | ||||
| -rw-r--r-- | src/doc_reform/meta/conf_make_meta_structs.d | 10 | ||||
| -rw-r--r-- | src/doc_reform/meta/conf_make_meta_yaml.d | 45 | ||||
| -rw-r--r-- | src/doc_reform/meta/metadoc_show_config.d | 22 |
4 files changed, 39 insertions, 40 deletions
diff --git a/src/doc_reform/meta/conf_make_meta_json.d b/src/doc_reform/meta/conf_make_meta_json.d index 7c77f65..cc46754 100644 --- a/src/doc_reform/meta/conf_make_meta_json.d +++ b/src/doc_reform/meta/conf_make_meta_json.d @@ -254,7 +254,7 @@ static template contentJSONtoSpineStruct() { ) { _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_host = m.captures[2].to!string; _struct_composite.conf.w_srv_url_doc_path = m.captures[3].to!string; } } diff --git a/src/doc_reform/meta/conf_make_meta_structs.d b/src/doc_reform/meta/conf_make_meta_structs.d index 2863f0d..aff2465 100644 --- a/src/doc_reform/meta/conf_make_meta_structs.d +++ b/src/doc_reform/meta/conf_make_meta_structs.d @@ -192,19 +192,19 @@ struct ConfCompositeMakeInit { } struct ConfCompositeSiteLocal { string w_srv_http; - string w_srv_domain; + string w_srv_host; string w_srv_data_http; // if not set same as webserv_http - string w_srv_data_domain; // if not set same as webserv_domain + string w_srv_data_host; // if not set same as webserv_host string w_srv_data_root_part; string w_srv_data_root_url; string w_srv_data_root_url_html; string w_srv_data_root_path; string w_srv_images_root_part; // string w_srv_url_doc_path; - string w_srv_cgi_title; + string w_srv_cgi_search_form_title; string w_srv_cgi_http; // if not set same as webserv_http - string w_srv_cgi_domain; // if not set same as webserv_domain - string w_srv_cgi_bin_part; + string w_srv_cgi_host; // if not set same as webserv_host + string w_srv_cgi_bin_subpath; string w_srv_cgi_bin_path; string w_srv_cgi_search_title; string w_srv_cgi_search_script; 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; diff --git a/src/doc_reform/meta/metadoc_show_config.d b/src/doc_reform/meta/metadoc_show_config.d index 20e796f..2b07c77 100644 --- a/src/doc_reform/meta/metadoc_show_config.d +++ b/src/doc_reform/meta/metadoc_show_config.d @@ -74,8 +74,8 @@ template spineShowSiteConfig() { writefln( "\n%s\n%40-s%10-s\n%40-s%10-s\n%40-s%10-s\n%40-s%10-s\n%40-s%10-s\n%40-s%10-s\n%40-s%10-s\n%40-s%10-s\n%40-s%10-s\n%40-s%10-s\n%40-s%10-s\n%40-s%10-s\n%40-s%10-s\n%40-s%10-s\n%40-s%10-s\n%40-s%10-s\n%40-s%10-s\n%40-s%10-s\n%40-s%10-s\n%40-s%10-s\n%40-s%10-s\n", markup.repeat_character_by_number_provided("-", char_repeat_number), - "- webserv domain name:", - config.conf.w_srv_domain, + "- webserv host name:", + config.conf.w_srv_host, "- webserv doc root (part):", config.conf.w_srv_data_root_part, "- webserv doc path:", @@ -84,12 +84,12 @@ template spineShowSiteConfig() { config.conf.w_srv_images_root_part, "- webserv doc root url:", config.conf.w_srv_data_root_url, - "- webserv cgi domain (host):", - config.conf.w_srv_cgi_domain, + "- webserv cgi host (host):", + config.conf.w_srv_cgi_host, "- webserv cgi host path:", config.conf.w_srv_cgi_bin_path, "- webserv cgi host (part):", - config.conf.w_srv_cgi_bin_part, + config.conf.w_srv_cgi_bin_subpath, "- webserv cgi search script:", config.conf.w_srv_cgi_search_script, "- webserv cgi search script in d:", @@ -103,7 +103,7 @@ template spineShowSiteConfig() { "- webserv cgi action:", config.conf.w_srv_cgi_action, "- webserv cgi title:", - config.conf.w_srv_cgi_title, + config.conf.w_srv_cgi_search_form_title, // "- webserv cgi file links:", // config.conf.w_srv_cgi_file_links, "- webserv sqlite db:", @@ -174,8 +174,8 @@ template spineShowConfig() { doc_matters.conf_make_meta.meta.creator_author, doc_matters.src.filename, markup.repeat_character_by_number_provided("-", char_repeat_number), - "- webserv domain name:", - doc_matters.conf_make_meta.conf.w_srv_domain, + "- webserv host name:", + doc_matters.conf_make_meta.conf.w_srv_host, "- webserv doc root (part):", doc_matters.conf_make_meta.conf.w_srv_data_root_part, "- webserv doc path:", @@ -184,12 +184,12 @@ template spineShowConfig() { doc_matters.conf_make_meta.conf.w_srv_images_root_part, "- webserv doc root url:", doc_matters.conf_make_meta.conf.w_srv_data_root_url, - "- webserv cgi domain (host):", - doc_matters.conf_make_meta.conf.w_srv_cgi_domain, + "- webserv cgi host (host):", + doc_matters.conf_make_meta.conf.w_srv_cgi_host, "- webserv cgi host path:", doc_matters.conf_make_meta.conf.w_srv_cgi_bin_path, "- webserv cgi host (part):", - doc_matters.conf_make_meta.conf.w_srv_cgi_bin_part, + doc_matters.conf_make_meta.conf.w_srv_cgi_bin_subpath, "- webserv cgi search script:", doc_matters.conf_make_meta.conf.w_srv_cgi_search_script, "- webserv cgi search script in d:", |