From 3bf0141d26099e6450f7a7ff7527986ecbdfa48c Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Wed, 19 Apr 2023 18:47:58 +0100
Subject: [PATCH 1/3] Fix content symlinks

---
 root/defaults/config.default.js               |  3 +--
 .../s6-overlay/s6-rc.d/init-raneto-config/run | 25 +++++++++++--------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/root/defaults/config.default.js b/root/defaults/config.default.js
index 98c11d1..272e579 100644
--- a/root/defaults/config.default.js
+++ b/root/defaults/config.default.js
@@ -68,7 +68,7 @@ var config = {
   content_dir : '/config/content/',
 
   // Where is the public directory or document root?
-  public_dir  : '/app/raneto/themes/default/public',
+  public_dir: path.join(theme_dir, theme_name, 'public'),
 
   // The base URL of your images folder,
   // Relative to config.public_dir
@@ -165,7 +165,6 @@ var config = {
   menu_on_pages: true,
   menu_on_page_collapsible: true,
 };
-config.public_dir = '/app/raneto/themes/default/public';
 
 // Exports
 module.exports = config;
diff --git a/root/etc/s6-overlay/s6-rc.d/init-raneto-config/run b/root/etc/s6-overlay/s6-rc.d/init-raneto-config/run
index 69de2d0..2a1f0ef 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-raneto-config/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-raneto-config/run
@@ -1,19 +1,22 @@
 #!/usr/bin/with-contenv bash
 # shellcheck shell=bash
 
-# make directories if necessary
-mkdir -p /config/content
+folders=(
+    /app/raneto/node_modules/@raneto/theme-default/dist/public/images
+    /app/raneto/content
+)
 
-i=/app/raneto/themes/default/public/images
-if [[ -e "$i" && ! -L "$i" && -e /config/"$(basename "$i")" ]]; then
-    rm -Rf "$i" && \
-    ln -s /config/"$(basename "$i")" "$i"
-fi
+for i in "${folders[@]}"; do
+    if [[ -e "$i" && ! -L "$i" && -e /config/"$(basename "$i")" ]]; then
+        rm -Rf "$i" && \
+        ln -s /config/"$(basename "$i")" "$i"
+    fi
 
-if [[ -e "$i" && ! -L "$i" ]]; then
-    mv "$i" /config/"$(basename "$i")" && \
-    ln -s /config/"$(basename "$i")" "$i"
-fi
+    if [[ -e "$i" && ! -L "$i" ]]; then
+        mv "$i" /config/"$(basename "$i")" && \
+        ln -s /config/"$(basename "$i")" "$i"
+    fi
+done
 
 # create local user server files
 if [[ ! -f /config/config.default.js ]]; then

From f62a79a366c3318dcdc47e7b82133710cacbd17c Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Fri, 21 Apr 2023 15:49:53 +0100
Subject: [PATCH 2/3] Fix config path type

---
 root/defaults/server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/root/defaults/server.js b/root/defaults/server.js
index 8e1b9f7..6695dfd 100644
--- a/root/defaults/server.js
+++ b/root/defaults/server.js
@@ -11,7 +11,7 @@ var raneto = require('./app/index.js');
 // Then, we load our configuration file
 // This can be done inline, with a JSON file,
 // or with a Node.js module as we do below.
-var config = require('./config/config.default.js');
+var config = require('/config/config.default.js');
 
 // Finally, we initialize Raneto
 // with our configuration object

From 5cb9fd7c4dd2401be07be0654b2c447871fd5f5f Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Fri, 21 Apr 2023 18:49:21 +0100
Subject: [PATCH 3/3] Add changelog note

---
 README.md       | 1 +
 readme-vars.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 74da342..b925b81 100644
--- a/README.md
+++ b/README.md
@@ -231,6 +231,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **21.04.23:** - Fix for upstream changes. Content now needs to be placed in /config/content/pages.
 * **18.01.23:** - Rebase to Alpine 3.17, migrate to s6v3.
 * **10.08.22:** - Rebasing to alpine 3.15.
 * **23.01.21:** - Rebasing to alpine 3.13.
diff --git a/readme-vars.yml b/readme-vars.yml
index d63d4e0..909fc70 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -42,6 +42,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "21.04.23:", desc: "Fix for upstream changes. Content now needs to be placed in /config/content/pages." }
   - { date: "18.01.23:", desc: "Rebase to Alpine 3.17, migrate to s6v3." }
   - { date: "10.08.22:", desc: "Rebasing to alpine 3.15." }
   - { date: "23.01.21:", desc: "Rebasing to alpine 3.13." }