Merge branch 'develop'

# Conflicts:
#	Dockerfile
#	README.md
#	docker-compose.yml
#	docker-entrypoint.sh
#	stats/info.php

Author: JVMerkle

Dockerfile

@@ -1,18 +1,20 @@
 FROM php:7.4-apache
 
 RUN apt-get update && \
-    apt-get install -y libzip-dev && \
+    apt-get install -y libzip-dev tini && \
     pecl install zip && \
     docker-php-ext-configure pdo_mysql && \
     docker-php-ext-install pdo_mysql && \
     docker-php-ext-enable zip && \
     rm -rf /var/lib/apt/lists/*
 
+# Use the PHP production settings.
 # Accept X-Forwarded-For as real client ip from a TRUSTED PROXY.
 # Set the "Server" header to production (e.g. to "Apache") and
 # remove apache version information. Build the ETAG from
 # last modified and size only.
-RUN a2enmod remoteip && \
+RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" && \
+    a2enmod remoteip && \
     ( \
         echo "RemoteIPHeader X-Forwarded-For" && \
         echo "ServerTokens Prod" && \
@@ -30,4 +32,7 @@ RUN mv /var/www/ranksystem/docker-entrypoint.sh /docker-entrypoint.sh && \
     chown www-data:www-data -R /var/www
 
 USER www-data
+WORKDIR /
+ENTRYPOINT ["/usr/bin/tini", "--"]
+
 CMD ["/bin/sh", "/docker-entrypoint.sh"]

README.md

@@ -10,7 +10,7 @@ This is a modified fork of the TSN-Ranksystem which is updated irregularly to a
 Please make sure that your TSN-Ranksystem (database) version is not above the (database) version of this fork (downgrade).
 
 ## Docker
-You can find the docker images on [docker hub](https://hub.docker.com/r/jvmerkle/ts3-ranksystem).
+You can find the docker images on docker hub as [jvmerkle/ts3-ranksystem](https://hub.docker.com/r/jvmerkle/ts3-ranksystem).
 Please note that the container **MUST BE accessed via a trusted proxy server only** (e.g. nginx).
 Make sure to set `BASE_HREF` to the relative URL path of the rank system (e.g. `https://foobar.com/frank/ranksystem` => `BASE_HREF=/frank/ranksystem/`) in the `docker-compose.yml`
 
@@ -29,15 +29,7 @@ docker-compose up -d
 ### Existing installation
 Import your database into the `ranksystem-db` container and update the `DB_NAME` of the docker compose file if required.
 
-### Accessing the host
-If you want to connect to your host teamspeak start it with `--add-host=host.docker.internal:host-gateway` or add
-```
-extra_hosts:
-- "host.docker.internal:host-gateway"
-```
-to your `docker-compose.yml`
-
-## Differences
+## Modifications
 Additions and (security) improvements to [Newcomer1989/TSN-Ranksystem](https://github.com/Newcomer1989/TSN-Ranksystem)
 
 - Disabled self-updating process, which __exposes information__ to *ts-n.net* such as

docker-compose.yml

@@ -8,6 +8,7 @@ services:
   ranksystem:
     image: jvmerkle/ts3-ranksystem
     restart: on-failure
+    stop_signal: SIGTERM
     depends_on:
       - ranksystem-db
     ports:

docker-entrypoint.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2020 Julian Merkle <julian.merkle@gmail.com>
+# Copyright (C) 2020 Julian Merkle <juli.merkle@gmail.com>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

stats/info.php

@@ -23,12 +23,12 @@
 					<div class="row">
 						<div class="col-lg-12">
 							<h4><strong><span class="text-success"><?PHP echo $lang['stri0004']; ?></span></strong></h4>
-							<p>The <a href="//ts-ranksystem.com" target="_blank" rel="noopener noreferrer">Ranksystem</a> was coded by <strong>Newcomer1989</strong> Copyright &copy; 2009-2020 powered by <a href="//ts-n.net/" target="_blank" rel="noopener noreferrer">TS-N.NET</a></p>
-							<p>This is a patched fork from <a href="https://github.com/JVMerkle/TS3-Ranksystem" target="_blank" rel="noopener noreferrer">github.com/JVMerkle/TS3-Ranksystem</a>, Copyright &copy; 2021 <strong>JVMerkle and Contributors</strong></p>
+							<p>The <a href="https://github.com/Newcomer1989/TSN-Ranksystem" target="_blank" rel="noopener noreferrer">TSN-Ranksystem</a> was coded by Newcomer1989 Copyright &copy; 2009-2020 powered by TS-N.NET</p>
+							<p>This is a patch set from <a href="https://github.com/JVMerkle/TS3-Ranksystem" target="_blank" rel="noopener noreferrer">github.com/JVMerkle/TS3-Ranksystem</a>, Copyright &copy; 2021 JVMerkle and TS3-Ranksystem contributors</p>
                             <br>
 						</div>
 					</div>
-					<div class="row">
+					<!--<div class="row">
 						<div class="col-lg-12">
 							<h4><strong><span class="text-warning"><?PHP echo $lang['stri0005']; ?></span></strong></h4>
 							<p><?PHP echo $lang['stri0006']; ?></p>
@@ -37,7 +37,7 @@
 							<p><?PHP echo sprintf($lang['stri0008'], '//ts-ranksystem.com/#download'); ?></p>
 							<br>
 						</div>
-					</div>
+					</div>-->
 					<div class="row">
 						<div class="col-lg-12">
 							<h4><strong><span class="text-danger"><?PHP echo $lang['stri0009'];?></span></strong></h4>