diff --git a/strassenkind.php b/strassenkind.php
index fa989d3..ce02f46 100644
--- a/strassenkind.php
+++ b/strassenkind.php
@@ -18,7 +18,7 @@ echo "Done.";
Strassenkind Server Status Page
-
+
";
From 8b29fc9f48b347d5c2ef9db813de15c8d59fee6f Mon Sep 17 00:00:00 2001
From: LinuxMint4Ever <>
Date: Wed, 19 Feb 2020 03:54:48 +0100
Subject: [PATCH 2/7] added variable replacement command for %CONTENT_DIR%
---
deployment-script.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/deployment-script.sh b/deployment-script.sh
index 47ca89d..09ecfa0 100755
--- a/deployment-script.sh
+++ b/deployment-script.sh
@@ -3,5 +3,9 @@ echo "Deployment script for repository \"web-deployment\"
`date`
=============================================================================="
+echo "Replacing %CONTENT_DIR% in all HTML and PHP files."
+CONTENT_DIR="/common/content"
+echo -e "`find ./ -name '*.html' -or -name '*.php' | sed "s/^/workingfile=\'/;s/\$/\'\; cat \\\$workingfile > .\/tmpdeploymentfile\; cat tmpdeploymentfile | sed \'s#%CONTENT_DIR%#\$CONTENT_DIR#\' > \\\$workingfile/"`\nrm tmpdeploymentfile"
+
echo "==============================================================================
Done."
From 37516e1cf6687c69e7e8a2b530bdde4abd3e45e2 Mon Sep 17 00:00:00 2001
From: LinuxMint4Ever <>
Date: Wed, 19 Feb 2020 04:04:08 +0100
Subject: [PATCH 3/7] moved index file to common/content to make things easier
---
content/index.html | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/content/index.html b/content/index.html
index 8b13789..7ba97b3 100644
--- a/content/index.html
+++ b/content/index.html
@@ -1 +1,27 @@
+
+
+
+
Home page
+
+
+
+
+
+
+
+
ThreadR Homepage
+
+
+
+
+
+
+
+
+
From 1a5f0d60ecc4b53bcfdf584214b7c04e560dcda9 Mon Sep 17 00:00:00 2001
From: LinuxMint4Ever <>
Date: Wed, 19 Feb 2020 04:07:26 +0100
Subject: [PATCH 4/7] duplicated redirect page and changed paths to
%CONTENT_DIR%
---
default.html | 4 ++--
index.html | 31 +++++++------------------------
2 files changed, 9 insertions(+), 26 deletions(-)
diff --git a/default.html b/default.html
index 2af4536..6950776 100644
--- a/default.html
+++ b/default.html
@@ -1,10 +1,10 @@
-
+
Your browser seems to not support redirects.
- Please klick the following link to continue: Go to home page...
+ Please klick the following link to continue:
Go to home page...
diff --git a/index.html b/index.html
index 7ba97b3..6950776 100644
--- a/index.html
+++ b/index.html
@@ -1,27 +1,10 @@
-
-
Home page
-
-
-
-
-
-
-
-
-
ThreadR Homepage
-
-
-
-
-
-
+
+
+
+
+
Your browser seems to not support redirects.
+ Please klick the following link to continue: Go to home page...
+
-
-
From e0ac74bc51c6f37d5ff772210a7499fd5938f54d Mon Sep 17 00:00:00 2001
From: LinuxMint4Ever <>
Date: Wed, 19 Feb 2020 04:09:31 +0100
Subject: [PATCH 5/7] fixed stupid mistake preventing the deployment script
from running properly before first run ... Ha!
---
deployment-script.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/deployment-script.sh b/deployment-script.sh
index 09ecfa0..a70a279 100755
--- a/deployment-script.sh
+++ b/deployment-script.sh
@@ -5,7 +5,7 @@ echo "Deployment script for repository \"web-deployment\"
echo "Replacing %CONTENT_DIR% in all HTML and PHP files."
CONTENT_DIR="/common/content"
-echo -e "`find ./ -name '*.html' -or -name '*.php' | sed "s/^/workingfile=\'/;s/\$/\'\; cat \\\$workingfile > .\/tmpdeploymentfile\; cat tmpdeploymentfile | sed \'s#%CONTENT_DIR%#\$CONTENT_DIR#\' > \\\$workingfile/"`\nrm tmpdeploymentfile"
+echo -e "`find ./ -name '*.html' -or -name '*.php' | sed "s/^/workingfile=\'/;s/\$/\'\; cat \\\$workingfile > .\/tmpdeploymentfile\; cat tmpdeploymentfile | sed \'s#%CONTENT_DIR%#\$CONTENT_DIR#\' > \\\$workingfile/"`\nrm tmpdeploymentfile" | bash -
echo "==============================================================================
Done."
From dc2dcb1902cb7d06ef8bdb310889ab20f09edee1 Mon Sep 17 00:00:00 2001
From: LinuxMint4Ever <>
Date: Wed, 19 Feb 2020 04:18:32 +0100
Subject: [PATCH 6/7] updated readme to include information on variables
---
README.md | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index 0d32d7e..d1aa982 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,8 @@
# Git based automatic web deployment system
-This repository will be automagically pulled by the web server each time something is pushed by a user. The following files and directories are linked to areas where they can be accessed by the web server:
+This repository will be automagically pulled by the web server each time something is pushed by a user.
+
+## Symlinks
+The following files and directories are linked to areas where they can be accessed by the web server:
* `index.html` → `*/common/index.html` (the website as seen by the majority of the users, maybe a login page?)
* `icon.png` → `*/common/icon.png` (self-explanatory)
* `stylesheet.css` → `*/common/stylesheet.css` (self-explanatory)
@@ -10,8 +13,13 @@ This repository will be automagically pulled by the web server each time somethi
* `commands_status.conf` → `strassenkind.ip/commands_status.conf`
* `commands_ondemand.conf` → `strassenkind.ip/commands_ondemand.conf`
-## Some server variables that might turn out to be useful:
+## Variables handled by the deployment script
+Here is the place for variables that will be replaced automatically on the server. Using them is encouraged. Using the paths is DISCOURAGED.
+This way, it is possible to change folder names around and fix the URLs in one place for all files simultaneously.
+ * `%CONTENT_DIR%` → The part of the URL between the domain name and the destination (e.g. https://lostcave.ddnss.de**/common/content/**about/)
+
+## Some server variables that might turn out to be useful (example):
{
"HTTP_USER_AGENT":"Mozilla\/5.0 (X11; Ubuntu; Linux x86_64; rv:73.0) Gecko\/20100101 Firefox\/73.0",
"REMOTE_ADDR":"10.1.1.3"
-}
\ No newline at end of file
+}
From 9244f4d19b121f8b3adf020166bfc6c59442dfd6 Mon Sep 17 00:00:00 2001
From: LinuxMint4Ever <>
Date: Wed, 19 Feb 2020 04:33:25 +0100
Subject: [PATCH 7/7] fixed various little things
---
content/img/index.html | 9 +++++++++
content/login/index.html | 9 ++++++---
content/news/index.php | 0
content/signup/index.html | 8 ++++----
content/userhome/index.php | 5 ++---
5 files changed, 21 insertions(+), 10 deletions(-)
create mode 100644 content/img/index.html
create mode 100644 content/news/index.php
diff --git a/content/img/index.html b/content/img/index.html
new file mode 100644
index 0000000..90f36ab
--- /dev/null
+++ b/content/img/index.html
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
Nope.
+
+
diff --git a/content/login/index.html b/content/login/index.html
index 3cc4db4..75b838a 100644
--- a/content/login/index.html
+++ b/content/login/index.html
@@ -7,10 +7,10 @@
diff --git a/content/news/index.php b/content/news/index.php
new file mode 100644
index 0000000..e69de29
diff --git a/content/signup/index.html b/content/signup/index.html
index 6be5b6e..ab29cb9 100644
--- a/content/signup/index.html
+++ b/content/signup/index.html
@@ -6,10 +6,10 @@
diff --git a/content/userhome/index.php b/content/userhome/index.php
index 1f125c8..8683644 100644
--- a/content/userhome/index.php
+++ b/content/userhome/index.php
@@ -2,8 +2,7 @@
ThreadR
-
+
ThreadR
- Welcome back, !
-
+ Welcome back, !
+ 
+ 