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 +} diff --git a/content/about/index.html b/content/about/index.html index 4135528..39ee9c0 100644 --- a/content/about/index.html +++ b/content/about/index.html @@ -4,7 +4,7 @@ About us... - + @@ -20,7 +20,7 @@ Who we are
- Image of the team + Image of the team

From left to right: Ilja, Jakob, Jan [me], and Erik

@@ -34,7 +34,7 @@ About the server
- Image of the server + Image of the server

The server at its current place in the basement

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/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

+

+

+

+
+ + + + + diff --git a/content/login/index.html b/content/login/index.html index ca6bbf4..75b838a 100644 --- a/content/login/index.html +++ b/content/login/index.html @@ -2,15 +2,15 @@ ThreadR - Welcome - +
@@ -25,21 +25,24 @@

Login:

-
+

- + +

- +

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 0aa1688..ab29cb9 100644 --- a/content/signup/index.html +++ b/content/signup/index.html @@ -2,14 +2,14 @@ Sign Up - +
@@ -24,7 +24,7 @@

Sign Up:

-
+

Benutzername:

E-Mail:

Passwort:

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, !

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/deployment-script.sh b/deployment-script.sh index 47ca89d..a70a279 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" | bash - + echo "============================================================================== Done." diff --git a/index.html b/index.html index 679a6ec..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...

+ - - 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 - + ";