From 83f7a09e251da70c0d59c5a0dee3f6b07e7f251e Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Mon, 24 Apr 2023 18:10:40 +0100
Subject: [PATCH] Fix server.js copy + theme path

---
 readme-vars.yml                                    | 2 +-
 root/defaults/config.default.js                    | 3 +--
 root/etc/s6-overlay/s6-rc.d/init-raneto-config/run | 5 +++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/readme-vars.yml b/readme-vars.yml
index 909fc70..cdd9df9 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -42,7 +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: "21.04.23:", desc: "Fix for upstream changes." }
   - { 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." }
diff --git a/root/defaults/config.default.js b/root/defaults/config.default.js
index 272e579..9a7d22b 100644
--- a/root/defaults/config.default.js
+++ b/root/defaults/config.default.js
@@ -10,8 +10,7 @@ var path = require('path');
 // Themes from NPM
 // use "dist" as the theme name for modules (for now)
 var theme_dir = path.join(
-  __dirname,
-  '..',
+  '/app/raneto',
   'node_modules',
   '@raneto/theme-default'
 );
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 2a1f0ef..40ca000 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
@@ -23,8 +23,9 @@ if [[ ! -f /config/config.default.js ]]; then
     cp /defaults/config.default.js /config/config.default.js
 fi
 
-if [[ ! -f /app/raneto/server.js ]]; then
-    cp /defaults/server.js /app/raneto/server.js
+if [[ -f "/defaults/server.js" ]]; then
+    rm -rf "/app/raneto/server.js"
+    mv "/defaults/server.js" "/app/raneto/server.js"
 fi
 
 # permissions