From a194900782fef2666fc41b3f60a730959ce0da36 Mon Sep 17 00:00:00 2001
From: Simon Martens <simonmartens@mailbox.org>
Date: Fri, 27 Oct 2023 22:40:41 +0200
Subject: [PATCH] Fixed some minor docker bugs

---
 HaWeb/Dockerfile                              |  2 +-
 HaWeb/appsettings.json                        | 56 +++++++++----------
 ...tings.Docker.json => appsettings.json.old} | 12 ++--
 3 files changed, 35 insertions(+), 35 deletions(-)
 rename HaWeb/{appsettings.Docker.json => appsettings.json.old} (67%)

diff --git a/HaWeb/Dockerfile b/HaWeb/Dockerfile
index d669ae2..e94c23c 100644
--- a/HaWeb/Dockerfile
+++ b/HaWeb/Dockerfile
@@ -19,6 +19,6 @@ RUN dotnet publish --no-restore -o /app
 
 # RUN
 WORKDIR /app
-RUN export DOTNET_ENVIRONMENT="Docker" 
+RUN export DOTNET_ENVIRONMENT="Docker"
 RUN dotnet HaWeb.dll
 EXPOSE 5000
diff --git a/HaWeb/appsettings.json b/HaWeb/appsettings.json
index 90237f5..ab4b907 100644
--- a/HaWeb/appsettings.json
+++ b/HaWeb/appsettings.json
@@ -1,28 +1,28 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "FeatureManagement": {
-    "AdminService":  true,
-    "LocalPublishService": true,
-    "SyntaxCheck": true,
-    "Notifications": true
-  },
-  "AllowedWebSocketConnections": "*",
-  "AllowedHosts": "*",
-  "HamannFileStoreLinux": "/var/www/vhosts/hamann-ausgabe.de/httpdocs/Hamann/",
-  "BareRepositoryPathLinux": "/var/www/vhosts/hamann-ausgabe.de/httpdocs/Bare/",
-  "BareRepositoryPathWindows": "C:/Users/simon/source/hamann-xml/.git/",
-  "WorkingTreePathLinux": "/var/www/vhosts/hamann-ausgabe.de/httpdocs/Repo/",
-  "RepositoryBranch": "Release",
-  "RepositoryURL": "https://github.com/Theodor-Springmann-Stiftung/hamann-xml",
-  "StoredPDFPathWindows": "",
-  "StoredPDFPathLinux": "",
-  "FileSizeLimit": 52428800,
-  "AvailableStartYear": 1700,
-  "AvailableEndYear": 1800,
-  "LettersOnPage": 80
-}
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning"
+    }
+  },
+  "FeatureManagement": {
+    "AdminService": true,
+    "LocalPublishService": true,
+    "SyntaxCheck": true,
+    "Notifications": true
+  },
+  "AllowedWebSocketConnections": "*",
+  "AllowedHosts": "*",
+  "HamannFileStoreLinux": "/data/hamann/",
+  "BareRepositoryPathLinux": "/data/xml/.git/",
+  "BareRepositoryPathWindows": "C:/Users/simon/source/hamann-xml/.git/",
+  "WorkingTreePathLinux": "/data/xml/",
+  "RepositoryBranch": "main",
+  "RepositoryURL": "https://github.com/Theodor-Springmann-Stiftung/hamann-xml",
+  "StoredPDFPathWindows": "",
+  "StoredPDFPathLinux": "",
+  "FileSizeLimit": 52428800,
+  "AvailableStartYear": 1700,
+  "AvailableEndYear": 1800,
+  "LettersOnPage": 80
+}
\ No newline at end of file
diff --git a/HaWeb/appsettings.Docker.json b/HaWeb/appsettings.json.old
similarity index 67%
rename from HaWeb/appsettings.Docker.json
rename to HaWeb/appsettings.json.old
index ab4b907..179360e 100644
--- a/HaWeb/appsettings.Docker.json
+++ b/HaWeb/appsettings.json.old
@@ -6,18 +6,18 @@
     }
   },
   "FeatureManagement": {
-    "AdminService": true,
+    "AdminService":  true,
     "LocalPublishService": true,
     "SyntaxCheck": true,
     "Notifications": true
   },
   "AllowedWebSocketConnections": "*",
   "AllowedHosts": "*",
-  "HamannFileStoreLinux": "/data/hamann/",
-  "BareRepositoryPathLinux": "/data/xml/.git/",
+  "HamannFileStoreLinux": "/var/www/vhosts/hamann-ausgabe.de/httpdocs/Hamann/",
+  "BareRepositoryPathLinux": "/var/www/vhosts/hamann-ausgabe.de/httpdocs/Bare/",
   "BareRepositoryPathWindows": "C:/Users/simon/source/hamann-xml/.git/",
-  "WorkingTreePathLinux": "/data/xml/",
-  "RepositoryBranch": "main",
+  "WorkingTreePathLinux": "/var/www/vhosts/hamann-ausgabe.de/httpdocs/Repo/",
+  "RepositoryBranch": "Release",
   "RepositoryURL": "https://github.com/Theodor-Springmann-Stiftung/hamann-xml",
   "StoredPDFPathWindows": "",
   "StoredPDFPathLinux": "",
@@ -25,4 +25,4 @@
   "AvailableStartYear": 1700,
   "AvailableEndYear": 1800,
   "LettersOnPage": 80
-}
\ No newline at end of file
+}