Serve site from fs

.dockerignore

@@ -1,6 +1,5 @@
 *
 !asset/
-asset/site/
 !bin/
 !lib/
 !dune

.gitignore

@@ -26,7 +26,7 @@ build/
 .vscode*
 
 # Site dir
-asset/site/
+asset_site/
 
 # Var dir
 _var/

Dockerfile

@@ -13,9 +13,6 @@ RUN opam install . --deps-only
 ADD package.json package.json
 RUN npm install
 
-# Download site static files
-COPY --from=ocurrent/v3.ocaml.org:live /data asset/site/
-
 # Build project
 COPY --chown=opam:opam . .
 RUN opam exec -- dune build
@@ -33,6 +30,9 @@ RUN chmod -R 755 /var
 
 RUN git clone https://github.com/ocaml/opam-repository /var/opam-repository
 
+# Download site static files
+COPY --from=ocurrent/v3.ocaml.org:live /data asset_site/
+
 EXPOSE 8080
 
 ENTRYPOINT /bin/server

Makefile

@@ -62,4 +62,4 @@ utop: ## Run a REPL and link with the project's libraries
 
 .PHONY: update-site
 update-site: ## Update the site directory
-	rm -rf asset/site; ./script/update-site.sh
+	rm -rf asset_site; ./script/update-site.sh

README.md

@@ -29,7 +29,7 @@ but you will need to download the `v3.ocaml.org` static files, which are crunche
 make update-site
 ```
 
-This will pull the v3.ocaml.org docker image and copy the static files from it into the `asset/site/` directory.
+This will pull the v3.ocaml.org docker image and copy the static files from it into the `asset_site/` directory.
 
 Then, build the project with:
 

dune

@@ -19,5 +19,5 @@
 ; Force dune to include _next.
 
 (subdir
- asset/site/
+ asset_site/
  (dirs *))

lib/ocamlorg_web/config.ml

@@ -5,6 +5,8 @@ let to_bool s =
 
 let debug = to_bool @@ env_with_default "OCAMLORG_DEBUG" "true"
 
+let site_dir = env_with_default "OCAMLORG_SITE_DIR" "asset_site/"
+
 let port = env_with_default "PORT" "8080" |> int_of_string
 
 let secret_key =

lib/ocamlorg_web/router.ml

@@ -1,18 +1,12 @@
-let v3_loader root path request =
-  let headers, path =
+let v3_loader root path =
+  let path =
     let fpath = Fpath.v path in
     if Fpath.is_dir_path fpath || not (Fpath.exists_ext fpath) then
-      (* charset is used internally in dream when setting this *)
-      ( [ "Content-Type", "text/html; charset=utf-8" ]
-      , Filename.concat path "index.html" )
+      Filename.concat path "index.html"
     else
-      Dream.mime_lookup path, path
+      path
   in
-  match Asset.read (root ^ path) with
-  | None ->
-    Page_handler.not_found request
-  | Some asset ->
-    Dream.respond ~headers asset
+  Dream.from_filesystem root path
 
 let loader root path request =
   match Asset.read (root ^ path) with
@@ -21,18 +15,18 @@ let loader root path request =
   | Some asset ->
     Dream.respond ~headers:(Dream.mime_lookup path) asset
 
-let media_loader _root path _request =
+let media_loader _root path request =
   match Ood_media.read path with
   | None ->
-    Dream.empty `Not_Found
+    Page_handler.not_found request
   | Some asset ->
     Dream.respond asset
 
 let site_route =
   Dream.scope
     ""
     [ Middleware.i18n ]
-    [ Dream.get "/**" (Dream.static ~loader:v3_loader "site/") ]
+    [ Dream.get "/**" (Dream.static ~loader:v3_loader Config.site_dir) ]
 
 let preview_routes =
   Dream.scope

script/update-site.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 docker pull ocurrent/v3.ocaml.org:live
-docker cp $(docker create --rm ocurrent/v3.ocaml.org:live):/data asset/site
+docker cp $(docker create --rm ocurrent/v3.ocaml.org:live):/data asset_site/