Merge branch 'develop'

Author: JVMerkle

Dockerfile

@@ -1,19 +1,21 @@
 FROM php:7.4-apache
 
 RUN apt-get update && \
-    apt-get install -y libzip-dev tini && \
+    apt-get install -y libcap2-bin tini libzip-dev && \
     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/*
 
+# Allow apache to bind to port 80 with any user
 # 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 mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" && \
+RUN setcap 'cap_net_bind_service=+ep' /usr/sbin/apache2 && \
+    mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" && \
     a2enmod remoteip && \
     ( \
         echo "RemoteIPHeader X-Forwarded-For" && \

README.md

@@ -6,7 +6,7 @@
 
 System that automatically grants ranks in the form of server groups for online time or online activity to users, using the given server groups of the TS3 server.
 
-This is a modified fork of the TSN-Ranksystem which is updated irregularly to a stable version (currently **1.3.17**) . It is intended to be fully compatible to TSN-Ranksystem at all times. The changeset on branch `develop` is always rebased onto TSN-Ranksystem and later on merged into `master`.
+This is a modified fork of the TSN-Ranksystem which is updated irregularly to a stable version. It is intended to be fully compatible to TSN-Ranksystem at all times. The changeset on branch `develop` is always rebased onto TSN-Ranksystem and later on merged into `master`.
 
 Please make sure that your TSN-Ranksystem (database) version is not above the (database) version of this fork (downgrade).
 

docker-compose.yml

@@ -19,6 +19,7 @@ services:
       - tsicons:/var/www/tsicons
     environment:
       #- INSTALL_MODE=1
+      # Example: BASE_HREF for "https://foobar.com/frank/ranksystem" is "/frank/ranksystem/"
       - BASE_HREF=/
       - DB_TYPE=mysql
       - DB_HOST=ranksystem-db