From fad1fcfea5b1f0ad4dfff7473afeb3c2981854d7 Mon Sep 17 00:00:00 2001 From: jem Date: Tue, 8 Jan 2019 19:59:16 +0100 Subject: [PATCH 1/2] make start page configurable --- resources/config.edn | 4 ++-- src/smeagol/routes/wiki.clj | 2 +- src/smeagol/util.clj | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/resources/config.edn b/resources/config.edn index 0fcb152..80d0738 100644 --- a/resources/config.edn +++ b/resources/config.edn @@ -28,6 +28,7 @@ ;; ; ; ; ; ; ; ; ; ; { :content-dir "resources/public/content" + :start-page "README" ;; where content is served from. :default-locale "en-GB" ;; default language used for messages :formatters {"vega" smeagol.formatting/process-vega @@ -38,6 +39,5 @@ ;; :trace :debug :info :warn :error :fatal :passwd "resources/passwd" ;; where the password file is stored - :site-title "Smeagol" ;; overall title of the site, used in + :site-title "Smeagol"} ;; overall title of the site, used in ;; page headings -} diff --git a/src/smeagol/routes/wiki.clj b/src/smeagol/routes/wiki.clj index 467275d..91174b2 100644 --- a/src/smeagol/routes/wiki.clj +++ b/src/smeagol/routes/wiki.clj @@ -125,7 +125,7 @@ (or (show-sanity-check-error) (let [params (keywordize-keys (:params request)) - page (or (:page params) (util/get-message :default-page-title "Introduction" request)) + page (or (:page params) util/start-page (util/get-message :default-page-title "Introduction" request)) file-name (str page ".md") file-path (cjio/file util/content-dir file-name) exists? (.exists (clojure.java.io/as-file file-path))] diff --git a/src/smeagol/util.clj b/src/smeagol/util.clj index 015a5db..8ab537d 100644 --- a/src/smeagol/util.clj +++ b/src/smeagol/util.clj @@ -35,6 +35,9 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +(def start-page + (:start-page config)) + (def content-dir (or (:content-dir config) From 4f8c4b8925d3596ff42c2906958cbf21efbd1992 Mon Sep 17 00:00:00 2001 From: jem Date: Fri, 18 Jan 2019 15:06:33 +0100 Subject: [PATCH 2/2] fixed test - Now we are getting a 200 response again. --- resources/config.edn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/config.edn b/resources/config.edn index 80d0738..d5f7017 100644 --- a/resources/config.edn +++ b/resources/config.edn @@ -28,7 +28,7 @@ ;; ; ; ; ; ; ; ; ; ; { :content-dir "resources/public/content" - :start-page "README" + :start-page "Introduction" ;; where content is served from. :default-locale "en-GB" ;; default language used for messages :formatters {"vega" smeagol.formatting/process-vega