config, clean up and make a bit more consistent

- check version settings with:
  rg -A2 _version_set$ org

1 files changed, 33 insertions, 35 deletions

diff --git a/org/meta_conf_make_meta.org b/org/meta_conf_make_meta.org
index e162bcc..e9f770c 100644
--- a/org/meta_conf_make_meta.org
+++ b/org/meta_conf_make_meta.org
@@ -33,20 +33,19 @@ default:
   digest:                     "sha256"
 webserv:
   http:                       "http"
-  domain:                     "localhost"
+  host:                       "localhost"
   data_http:                  "http"
-  data_domain:                "localhost"
+  data_host:                  "localhost"
   data_root_url:              "http://localhost"
   data_root_path:             "/var/www/html"
   data_root_part:             ""
   images_root_part:           "image"
-  cgi_title:                  "≅ SiSU Spine search"
   cgi_http:                   "http"
-  cgi_domain:                 "localhost"
+  cgi_host:                   "localhost"
   cgi_bin_url:                "http://localhost/cgi-bin"
-  cgi_bin_part:               "cgi-bin"
+  cgi_bin_subpath:            "cgi-bin"
   cgi_bin_path:               "/usr/lib/cgi-bin"
-  cgi_search_title:           "≅ SiSU spine search form"
+  cgi_search_form_title:      "≅ SiSU Spine search"
   cgi_search_script:          "spine_search"
   cgi_search_script_raw_fn_d: "spine_search.d"
   cgi_port:                   ""
@@ -263,19 +262,19 @@ struct ConfCompositeMakeInit {
 #+BEGIN_SRC d
 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;
@@ -629,11 +628,11 @@ if ("webserv" in _yaml
     ) {
       _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
@@ -641,7 +640,7 @@ if ("webserv" in _yaml
     // ) {
     //   _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;
     //   }
     // }
@@ -679,25 +678,25 @@ if ("webserv" in _yaml
         ~ _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
@@ -763,11 +762,10 @@ if ("webserv" in _yaml
           ? _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;
@@ -1659,7 +1657,7 @@ if ("webserv" in _json.object) {
   ) {
     _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;
     }
   }