From 118ea61dc79bf9b1c45bbf81b31361a749e32fdd Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Wed, 11 Aug 2021 03:06:47 -0400
Subject: spine search and configuration related

---
 src/doc_reform/io_in/read_config_files.d | 53 +++++++++++++++++---------------
 1 file changed, 28 insertions(+), 25 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 005a436..037fa22 100644
--- a/src/doc_reform/io_in/read_config_files.d
+++ b/src/doc_reform/io_in/read_config_files.d
@@ -72,35 +72,37 @@ flag:
   act0:              "--html"
   act1:              "--html --epub"
 output:
-  path:              "/var/www/html"
+  path:              "%s"
 default:
   language:          "en"
   papersize:         "a4"
-  text_wrap:         "80"
-  digest:            "sha256"
+  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:         "%s"
-  db_pg_table:       ""
-  db_pg_user:        ""
+  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:         ""
 ┃",
+  _cfg.www_doc_root,       // doc root
   _cfg.www_http,           // http
   _cfg.www_domain,         // domain
   _cfg.www_http,           // data http
@@ -114,7 +116,8 @@ webserv:
   _cfg.cgi_bin_root,       // cgi bin path
   _cfg.cgi_filename,       // cgi filename
   _cfg.cgi_url_action,     // cgi action
-  _cfg.db_sqlite_filename, // db filename
+  _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