From 31771f5a2eaaa04f8b8c972300d146605efb1e55 Mon Sep 17 00:00:00 2001
From: Stixx <stixx@nostrdev.com>
Date: Wed, 6 Nov 2024 15:13:35 +0100
Subject: [PATCH] fix: implementing bloossom server config ENV variable

---
 .idea/workspace.xml | 21 ++++++++++++++++-----
 Dockerfile          |  3 ++-
 start.sh            |  3 ---
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 038812d..edc1aa6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,9 +4,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="deaf6285-9bb5-4b4c-89a9-b0adf21548ad" name="Changes" comment="fix: config symlink">
-      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+    <list default="true" id="deaf6285-9bb5-4b4c-89a9-b0adf21548ad" name="Changes" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Dockerfile" beforeDir="false" afterPath="$PROJECT_DIR$/Dockerfile" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/start.sh" beforeDir="false" afterPath="$PROJECT_DIR$/start.sh" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -44,7 +44,7 @@
     &quot;Docker.Dockerfile prod-deps.executor&quot;: &quot;Run&quot;,
     &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
     &quot;git-widget-placeholder&quot;: &quot;master&quot;,
-    &quot;last_opened_file_path&quot;: &quot;/home/mihajlo/external-projects/nostrdev/stuff/blossom-cloudron&quot;,
+    &quot;last_opened_file_path&quot;: &quot;/home/mihajlo/external-projects/nostrdev/cheems/design&quot;,
     &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
     &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
     &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
@@ -107,6 +107,8 @@
       <workItem from="1730732957705" duration="8239000" />
       <workItem from="1730757410332" duration="15231000" />
       <workItem from="1730820334454" duration="124000" />
+      <workItem from="1730884753681" duration="7433000" />
+      <workItem from="1730901852078" duration="544000" />
     </task>
     <task id="LOCAL-00001" summary="init">
       <option name="closed" value="true" />
@@ -196,7 +198,15 @@
       <option name="project" value="LOCAL" />
       <updated>1730823252701</updated>
     </task>
-    <option name="localTasksCounter" value="12" />
+    <task id="LOCAL-00012" summary="fix: temporary fix reverse symlink">
+      <option name="closed" value="true" />
+      <created>1730825314560</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1730825314560</updated>
+    </task>
+    <option name="localTasksCounter" value="13" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -226,6 +236,7 @@
     <MESSAGE value="fix: start.sh permissions" />
     <MESSAGE value="fix: docker config symlink" />
     <MESSAGE value="fix: config symlink" />
-    <option name="LAST_COMMIT_MESSAGE" value="fix: config symlink" />
+    <MESSAGE value="fix: temporary fix reverse symlink" />
+    <option name="LAST_COMMIT_MESSAGE" value="fix: temporary fix reverse symlink" />
   </component>
 </project>
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index b44e520..52380cd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,7 +27,7 @@ RUN cd admin && pnpm build
 FROM base AS main
 
 COPY start.sh start.sh
-COPY config.example.yml config.yml
+COPY config.example.yml /app/data/config.yml
 COPY CloudronManifest.json .
 
 RUN chmod +x start.sh
@@ -46,5 +46,6 @@ VOLUME [ "/app/data" ]
 EXPOSE 3000
 
 ENV DEBUG="blossom-server,blossom-server:*"
+ENV BLOSSOM_CONFIG: "/app/data/config.yml"
 
 CMD [ "/app/start.sh" ]
diff --git a/start.sh b/start.sh
index d6c61cb..30fcd0a 100644
--- a/start.sh
+++ b/start.sh
@@ -1,8 +1,5 @@
 #!/bin/bash
 
-echo "==> Symlink the config.yml to the editable /app/data directory"
-ln -s /app/config.yml /app/data/config.yml
-
 echo "==> Changing ownership"
 chown -R cloudron:cloudron /app/data