simon/smeagol
1
0
Fork 0
mirror of https://github.com/journeyman-cc/smeagol.git synced 2026-04-12 18:05:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Again, I think I've solved the Tomcat startup issue.

Browse source
This commit is contained in:
Simon Brooke 2020-03-01 10:51:53 +00:00
parent 3943bd02e7
commit 6875abae84
No known key found for this signature in database
GPG key ID: A7A4F18D1D4DF987
3 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/config.edn
View file

@ -38,7 +38,7 @@
:scripts {}
:styles {}}
:geocsv {:formatter "smeagol.extensions.geocsv/process-geocsv"
:scripts {:core {:local "vendor/node_modules/@simon_brooke/geocsv/js/geocsv.js"}
:scripts {:core {:local "vendor/node_modules/geocsv-js/js/geocsv.js"}
:leaflet {:local "vendor/node_modules/leaflet/dist/leaflet.js"
:remote "https://unpkg.com/leaflet@1.6.0/dist/leaflet.js"}
:papaparse {:local "vendor/node_modules/papaparse/papaparse.js"

8
src/smeagol/middleware.clj
View file

@ -69,8 +69,12 @@
[#(wrap-internal-error % :log (fn [e] (log/error e)))
#(wrap-resource % "public")
smeagol-wrap-content-type
#(wrap-file % util/content-dir
{:index-files? false :prefer-handler? true})
#(try
(wrap-file % util/content-dir
{:index-files? false :prefer-handler? true})
(catch Exception error
(log/fatal "Could not locate content dir" util/content-dir error)
%))
wrap-not-modified])

2
src/smeagol/sanity.clj
View file

@ -369,7 +369,7 @@
[messages]
[:head
[:title (as-hiccup :smeagol-not-initialised messages)]
[:link {:href "/content/stylesheet.css" :rel "stylesheet"}]])
[:link {:href "content/stylesheet.css" :rel "stylesheet"}]])
(defn as-hiccup-header