Caddyfile2-https

.gitignore

@@ -72,7 +72,6 @@ deps.path*
 .bash_history
 result
 schema.graphql
-deploy
 .pnpm-debug.log
 .pnpm-store
 .pnpm-state.json

docker-compose.release.yml

@@ -29,7 +29,7 @@ services:
       - config/prod/.env
     volumes:
       - type: bind
-        source: ./config/deploy/Caddyfile2
+        source: ${PROXY_CADDYFILE_PATH}
         target: /etc/caddy/Caddyfile
         read_only: true
       - type: bind

docker-compose.yml

@@ -71,7 +71,7 @@ services:
       - config/dev/.env
     volumes:
       - type: bind
-        source: ./config/deploy/Caddyfile2
+        source: ${PROXY_CADDYFILE_PATH}
         target: /etc/caddy/Caddyfile
         read_only: true
       - type: bind

flavours/classic/config/deploy/Caddyfile2-https

@@ -0,0 +1,31 @@
+# config for Caddy v2
+
+#:80 # comment this line and uncomment the next 4 to enable HTTPS/SSL 
+:443
+tls {
+  on_demand
+}
+
+route /data/uploads/* {
+
+  root * /frontend/
+
+  # fallback to index (for single page site)
+  try_files {path} 
+
+  # serve static files
+  file_server 
+}
+
+route * {
+
+  # backend proxying
+  reverse_proxy web:4000 
+
+}
+
+# options
+encode gzip
+handle_errors
+log
+

justfile

@@ -1,6 +1,11 @@
 # recipes for the `just` command runner: https://just.systems
 # how to install: https://github.com/casey/just#packages
 
+# we load all vars from .env file into the env of just commands
+set dotenv-load
+# and export just vars as env vars
+set export
+
 ## Main configs - override these using env vars
 
 # what flavour do we want?
@@ -24,7 +29,6 @@ APP_DOCKER_IMAGE := env_var_or_default('APP_DOCKER_IMAGE', APP_DOCKER_REPO+":lat
 DB_DOCKER_IMAGE := if arch() == "aarch64" { "ghcr.io/baosystems/postgis:12-3.3" } else { env_var_or_default('DB_DOCKER_IMAGE', "postgis/postgis:12-3.3-alpine") } 
 
 ## Other configs - edit these here if necessary
-
 EXT_PATH := "extensions/"
 EXTRA_FORKS_PATH := "forks/"
 APP_VSN_EXTRA := "beta"
@@ -38,16 +42,14 @@ CONFIG_PATH := FLAVOUR_PATH + "/config"
 UID := `id -u`
 GID := `id -g`
 
+PROXY_CADDYFILE_PATH := if PUBLIC_PORT == "443" { "./config/deploy/Caddyfile2-https" } else { "./config/deploy/Caddyfile2" }  
+
 ENV_ENV := if MIX_ENV == "test" { "dev" } else { MIX_ENV } 
 
 ## Configure just
 # choose shell for running recipes
 set shell := ["bash", "-uc"]
 # set shell := ["bash", "-uxc"] 
-# load all vars from .env file
-set dotenv-load
-# export just vars into recipe as env vars
-set export
 # support args like $1, $2, etc, and $@ for all args
 set positional-arguments
 

mix.lock

@@ -34,16 +34,16 @@
   "bonfire_fail": {:git, "https://github.com/bonfire-networks/bonfire_fail", "3c1ab5c34ed8be7a0e706d642f5d6a9766835dc1", [branch: "main"]},
   "bonfire_federate_activitypub": {:git, "https://github.com/bonfire-networks/bonfire_federate_activitypub", "2052aacfcefde0932fcf8211260040c17affe11d", [branch: "main"]},
   "bonfire_files": {:git, "https://github.com/bonfire-networks/bonfire_files", "be5db2c4948a1a2ffb3d0f0421141e195e5240d7", [branch: "main"]},
-  "bonfire_invite_links": {:git, "https://github.com/bonfire-networks/bonfire_invite_links", "0360087aa4740b8061ecc50da8ba198c1ee3b42e", [branch: "main"]},
+  "bonfire_invite_links": {:git, "https://github.com/bonfire-networks/bonfire_invite_links", "609ba5b5dcf02b5fc134e3f49fe8714158f8e9f1", [branch: "main"]},
   "bonfire_mailer": {:git, "https://github.com/bonfire-networks/bonfire_mailer", "5c81951daa03e47796e0ae7213cb9d6dfbc10ccc", [branch: "main"]},
   "bonfire_me": {:git, "https://github.com/bonfire-networks/bonfire_me", "add5974ee3de9b5a9f45f7d9bc28e2e8b81d4909", [branch: "main"]},
-  "bonfire_pages": {:git, "https://github.com/bonfire-networks/bonfire_pages", "63019e362bdc205a6dd2a2f27f53361b59136c03", [branch: "main"]},
+  "bonfire_pages": {:git, "https://github.com/bonfire-networks/bonfire_pages", "a01540f10c775bc74fe4dff5734a9cd23d9a9962", [branch: "main"]},
   "bonfire_search": {:git, "https://github.com/bonfire-networks/bonfire_search", "123fa792e1bed852734ca8890fb9a1bbd8a79201", [branch: "main"]},
   "bonfire_social": {:git, "https://github.com/bonfire-networks/bonfire_social", "4d24d39a59d4facd4b16a17afa53112f18afcfe9", [branch: "main"]},
   "bonfire_tag": {:git, "https://github.com/bonfire-networks/bonfire_tag", "f53467a99ac44d58a1bb5975bea7b1214910ffcd", [branch: "main"]},
-  "bonfire_ui_common": {:git, "https://github.com/bonfire-networks/bonfire_ui_common", "d2d523178fa769015dde38d2efb3d230b8e259d0", [branch: "main"]},
+  "bonfire_ui_common": {:git, "https://github.com/bonfire-networks/bonfire_ui_common", "d71efbf7020b09ea60b08fb5b9a17912551d7c88", [branch: "main"]},
   "bonfire_ui_groups": {:git, "https://github.com/bonfire-networks/bonfire_ui_groups", "0287978541cfdff979b5b33d33ae2b0cc479f52d", [branch: "main"]},
-  "bonfire_ui_me": {:git, "https://github.com/bonfire-networks/bonfire_ui_me", "cecf8e91bd6f64c9f8a4a5435544f4047e2f96af", [branch: "main"]},
+  "bonfire_ui_me": {:git, "https://github.com/bonfire-networks/bonfire_ui_me", "14c08070e2a54281da8b920d208444ca662df171", [branch: "main"]},
   "bonfire_ui_social": {:git, "https://github.com/bonfire-networks/bonfire_ui_social", "5dfe3fc89d68c677f0ff4c29bdc0334d5166a32f", [branch: "main"]},
   "bonfire_ui_topics": {:git, "https://github.com/bonfire-networks/bonfire_ui_topics", "b5b18d716d58053bef56482a6c1da56e4dff6fa4", [branch: "main"]},
   "bunt": {:hex, :bunt, "0.2.1", "e2d4792f7bc0ced7583ab54922808919518d0e57ee162901a16a1b6664ef3b14", [:mix], [], "hexpm", "a330bfb4245239787b15005e66ae6845c9cd524a288f0d141c148b02603777a5"},