diff options
Diffstat (limited to 'src/doc_reform/meta/conf_make_meta_yaml.d')
| -rw-r--r-- | src/doc_reform/meta/conf_make_meta_yaml.d | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/doc_reform/meta/conf_make_meta_yaml.d b/src/doc_reform/meta/conf_make_meta_yaml.d index e2f4c43..af6096a 100644 --- a/src/doc_reform/meta/conf_make_meta_yaml.d +++ b/src/doc_reform/meta/conf_make_meta_yaml.d @@ -94,9 +94,9 @@ template contentYAMLtoSpineStruct() { = _opt_action.webserver_http; } else { _struct_composite.conf.w_srv_http - = (_cfg.www_http.empty) + = (_cfg.http_request_type.empty) ? "http" - : _cfg.www_http; + : _cfg.http_request_type; if (("webserv" in _yaml && _yaml["webserv"].type.sequence) && (_yaml["webserv"].type.mapping && _yaml["webserv"].tag.match(rgx.yaml_tag_is_map)) @@ -226,9 +226,9 @@ template contentYAMLtoSpineStruct() { = (_opt_action.output_dir_set.asNormalizedPath).array; } else { _struct_composite.conf.output_path - = (_cfg.www_doc_root.empty) + = (_cfg.processing_path_doc_root.empty) ? "/srv/www/spine" - : _cfg.www_doc_root; + : _cfg.processing_path_doc_root; if (("webserv" in _yaml && _yaml["webserv"].type.sequence) && (_yaml["webserv"].type.mapping && _yaml["webserv"].tag.match(rgx.yaml_tag_is_map)) @@ -254,9 +254,9 @@ template contentYAMLtoSpineStruct() { = _opt_action.webserver_host_doc_root; } else { _struct_composite.conf.w_srv_data_root_path - = (_cfg.www_doc_root.empty) + = (_cfg.processing_path_doc_root.empty) ? "/var/www/spine" - : _cfg.www_doc_root; + : _cfg.processing_path_doc_root; if (("webserv" in _yaml && _yaml["webserv"].type.sequence) && (_yaml["webserv"].type.mapping && _yaml["webserv"].tag.match(rgx.yaml_tag_is_map)) @@ -352,7 +352,8 @@ template contentYAMLtoSpineStruct() { ) { _struct_composite.conf.w_srv_data_root_url = _yaml["webserv"]["data_root_url"].get!string; _struct_composite.conf.w_srv_data_root_url_html = - _yaml["webserv"]["data_root_url"].get!string ~ "/" + _yaml["webserv"]["data_root_url"].get!string + ~ _struct_composite.conf.w_srv_data_root_part ~ "/" ~ _manifested.src.language ~ "/" ~ "html"; } else { |