From 24269204508d8cf8f963eb9c7d149d18840e4dad Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Thu, 12 Aug 2021 13:14:49 -0400
Subject: config, clean up and make a bit more consistent

- check version settings with:
  rg -A2 _version_set$ org
---
 src/doc_reform/io_in/read_config_files.d | 91 ++++++++++++++++----------------
 1 file changed, 46 insertions(+), 45 deletions(-)

(limited to 'src/doc_reform/io_in')

diff --git a/src/doc_reform/io_in/read_config_files.d b/src/doc_reform/io_in/read_config_files.d
index 037fa22..a3a5dd8 100644
--- a/src/doc_reform/io_in/read_config_files.d
+++ b/src/doc_reform/io_in/read_config_files.d
@@ -69,55 +69,56 @@ template readConfigSite() {
     string config_file_str;
     string default_config_file_str = format(q"┃
 flag:
-  act0:              "--html"
-  act1:              "--html --epub"
+  act0:                  "--html"
+  act1:                  "--html --epub"
 output:
-  path:              "%s"
+  path:                  "%s"
 default:
-  language:          "en"
-  papersize:         "a4"
-  text_wrap:          "80"
-  digest:             "sha256"
+  language:              "en"
+  papersize:             "a4"
+  text_wrap:             "80"
+  digest:                "sha256"
 webserv:
-  http:               "%s"
-  domain:             "%s"
-  data_http:          "%s"
-  data_domain:        "%s"
-  data_root_url:      "%s"
-  data_root_path:     "%s"
-  data_root_part:     ""
-  images_root_part:   "image"
-  cgi_title:          "%s"
-  cgi_http:           "%s"
-  cgi_domain:         "%s"
-  cgi_bin_url:        "%s"
-  cgi_bin_part:       "cgi-bin"
-  cgi_bin_path:       "%s"
-  cgi_search_script:  "%s"
-  cgi_port:           ""
-  cgi_user:           ""
-  cgi_action:         "%s"
-  db_sqlite_path:     "%s"
-  db_sqlite_filename: "%s"
-  db_pg_table:        ""
-  db_pg_user:         ""
+  http:                  "%s"
+  host:                  "%s"
+  data_http:             "%s"
+  data_host:             "%s"
+  data_root_url:         "%s"
+  data_root_path:        "%s"
+  data_root_part:        ""
+  images_root_part:      "image"
+  cgi_search_form_title: "%s"
+  cgi_http:              "%s"
+  cgi_host:              "%s"
+  cgi_bin_url:           "%s"
+  cgi_bin_subpath:       "%s"
+  cgi_bin_path:          "%s"
+  cgi_search_script:     "%s"
+  cgi_port:              ""
+  cgi_user:              ""
+  cgi_action:            "%s"
+  db_sqlite_path:        "%s"
+  db_sqlite_filename:    "%s"
+  db_pg_table:           ""
+  db_pg_user:            ""
 ┃",
-  _cfg.www_doc_root,       // doc root
-  _cfg.www_http,           // http
-  _cfg.www_domain,         // domain
-  _cfg.www_http,           // data http
-  _cfg.www_domain,         // data domain
-  _cfg.www_url_doc_root,   // data root url
-  _cfg.www_doc_root,       // data root path
-  _cfg.cgi_title,          // cgi title
-  _cfg.www_http,           // cgi http
-  _cfg.www_domain,         // cgi domain
-  _cfg.cgi_url_root,       // cgi bin url
-  _cfg.cgi_bin_root,       // cgi bin path
-  _cfg.cgi_filename,       // cgi filename
-  _cfg.cgi_url_action,     // cgi action
-  _cfg.db_sqlite_path,     // sqlite db path
-  _cfg.db_sqlite_filename, // sqlite db filename
+  _cfg.www_doc_root,          // doc root
+  _cfg.www_http,              // http
+  _cfg.www_host,              // host / domain
+  _cfg.www_http,              // data http
+  _cfg.www_host,              // data domain
+  _cfg.www_url_doc_root,      // data root url
+  _cfg.www_doc_root,          // data root path
+  _cfg.cgi_search_form_title, // cgi title
+  _cfg.www_http,              // cgi http
+  _cfg.www_host,              // cgi host
+  _cfg.cgi_url_root,          // cgi bin url
+  _cfg.cgi_bin_subpath,       // cgi bin path
+  _cfg.cgi_bin_root,          // cgi bin path
+  _cfg.cgi_filename,          // cgi filename
+  _cfg.cgi_url_action,        // cgi action
+  _cfg.db_sqlite_path,        // sqlite db path
+  _cfg.db_sqlite_filename,    // sqlite db filename
 );
     foreach(conf_fn; [_conf_file_details.config_filename_site]) {
       foreach(pth; _conf_file_details.possible_config_path_locations.config_local_site) {
-- 
cgit v1.2.3