Release 2.26 which incorporates the following changes

- Add a ENV_DIR for docker containers to allow changing the env file location changes where the rest of the configuration is bootstrapped from
- Add log_dir and snapshot_dir in env file configuration to determine the log and snapshot directories
- Massively cleaned up README and provide better examples

.drone.yml

@@ -0,0 +1,57 @@
+---
+kind: pipeline
+type: docker
+name: default
+
+trigger:
+    event:
+        include:
+            - push
+            - cron
+    branch:
+        - master
+
+environment: &default_environment
+    REVISION: ${DRONE_COMMIT_SHA}
+    CREATED: ${DRONE_BUILD_CREATED}
+    SOURCE_URL: ${DRONE_GIT_HTTP_URL}
+    # also change in 'tags' of build docker
+    TS3WEB_VERSION: 2.2.6
+
+steps:
+    -   name: build docker image
+        image: plugins/docker
+        environment:
+            <<: *default_environment
+        settings:
+            purge: true
+            repo: varakh/ts3web
+            username:
+                from_secret: dockerhub_user
+            password:
+                from_secret: dockerhub_key
+            tags:
+                - latest
+                - 2.2.6
+
+    -   name: notify
+        image: drillster/drone-email
+        settings:
+            subject: "Build failed"
+            body: "URL ${DRONE_BUILD_LINK}"
+            host:
+                from_secret: mail_host
+            username:
+                from_secret: mail_user
+            password:
+                from_secret: mail_password
+            from:
+                from_secret: mail_from
+        when:
+            status:
+                - failure
+---
+kind: signature
+hmac: f575a63bd85c4a95593be5e077373216fbd50ad57e6b3d1db56f950e881ed2a5
+
+...

CHANGELOG.md

@@ -1,5 +1,20 @@
 # CHANGELOG
 
+## 2.2.6 - 2023/04/06
+
+_Quick update for an outdated application to make it more useful for docker setups. Keep in mind that PHP 7.4 which is used by ts3web is still EOL!_
+
+* Made it possible to use environment variable to define location of bootstrapping `env` file in docker containers (natively, set php-fpm `ENV[]` properly!)
+    * `ENV_DIR`: location of the **PARENT** folder which has the `env` file inside
+    * Falls back to application `$appDir/config/env` file if not set
+* Added new `env` file variables to easily configure
+    * `log_dir`: location of the log dir, _without trailing slash_
+    * `snapshot_dir` location of the snapshots dir, _without trailing slash_
+
+## 2.2.5 - 2022/12/17
+* Updated `Dockerfile` (as long as alpine 3.15 shipping PHP7 is kept updated, `ts3web` docker images are kept)
+* Updated some symfony dependencies
+
 ## 2.2.4 - 2022/01/19
 * Updated dependencies
 * This application will be EOL once PHP7 is not supported anymore

Dockerfile

@@ -1,8 +1,12 @@
-FROM alpine:3
+FROM alpine:3.15
 
 LABEL maintainer="Varakh<varakh@varakh.de>"
 
-ENV APP_HOME /var/www/html/application
+ENV APP_HOME=/var/www/html/application \
+    PHP_MEMORY_LIMIT=512M \
+    MAX_UPLOAD=1024M \
+    PHP_MAX_FILE_UPLOAD=200 \
+    PHP_MAX_POST=1024M
 
 # setup folder structure
 RUN mkdir -p ${APP_HOME}/data/snapshots && \
@@ -10,6 +14,9 @@ RUN mkdir -p ${APP_HOME}/data/snapshots && \
     touch ${APP_HOME}/log/application.log && \
     mkdir -p ${APP_HOME}/config
 
+# entrypoint
+ADD docker/configure.php /configure.php
+
 # add upstream application
 ADD src ${APP_HOME}/src
 ADD public ${APP_HOME}/public
@@ -17,16 +24,11 @@ ADD composer.json ${APP_HOME}/composer.json
 ADD composer.lock ${APP_HOME}/composer.lock
 ADD data ${APP_HOME}/data
 ADD config ${APP_HOME}/config
-RUN mv ${APP_HOME}/config/env.example ${APP_HOME}/config/env
-
-# php.ini
-ENV PHP_MEMORY_LIMIT    512M
-ENV MAX_UPLOAD          1024M
-ENV PHP_MAX_FILE_UPLOAD 200
-ENV PHP_MAX_POST        1024M
 
 # install dependencies
-RUN apk add --update --no-cache \
+RUN cp ${APP_HOME}/config/env.example ${APP_HOME}/config/env && \
+    apk add --update --no-cache \
+        bash \
         nginx \
         s6 \
         curl \
@@ -71,10 +73,13 @@ RUN apk add --update --no-cache \
 # Add nginx config
 ADD docker/nginx.conf /etc/nginx/nginx.conf
 
+# Add required environment variables to php-fpm
+RUN echo "env[ENV_DIR]=%%%ENV_DIR%%%" >> /etc/php7/php-fpm.d/www.conf
+
 EXPOSE 80
 
 # add overlay
 ADD docker/s6 /etc/s6/
 
 # expose start
-CMD exec s6-svscan /etc/s6/
+CMD /usr/bin/php /configure.php && exec s6-svscan /etc/s6/

README.md

@@ -1,260 +1,164 @@
 # README
 
+[![Build Status](https://drone.myservermanager.com/api/badges/varakh/ts3web/status.svg)](https://drone.myservermanager.com/varakh/ts3web)
+
 ts3web is a free and open-source web interface for TeamSpeak 3 instances.
 
 The minimalistic approach of this application is intentional.
 
 * Docker images available on [https://hub.docker.com/r/varakh/ts3web](https://hub.docker.com/r/varakh/ts3web)
-* Sources are hosted on [https://github.com/v4rakh/ts3web](https://github.com/v4rakh/ts3web)
+* Sources are hosted on [https://git.myservermanager.com/varakh/ts3web](https://git.myservermanager.com/varakh/ts3web)
 
 There are many TeamSpeak 3 web interfaces out. Why should I pick ts3web? Free, simple, stateless, easy to extend,
 standard bootstrap theme.
 
+The main git repository is hosted at
+_[https://git.myservermanager.com/varakh/ts3web](https://git.myservermanager.com/varakh/ts3web)_.
+Other repositories are mirrors and pull requests, issues, and planning are managed there.
+
+Contributions are very welcome!
+
+## Limitations
+
+TeamSpeak has a detailed interface for permissions and uploading files, therefore the following features are not
+supported:
+
+* uploading files (only viewing and deleting, use the official client for uploading)
+* editing permissions (only viewing, use the client for editing)
+
 ## READ BEFORE USING
 
 This web interface makes **heavy use of TeamSpeak 3 server query commands**. Please ensure that you _increase query
 limits_ and whitelist the requesting IP address to a `whitelist.txt` when in a docker environment (see below).
 
-Please read the next FAQ section carefully!
+Please read the next sections carefully.
 
-## F.A.Q
+## Setup
 
-<a name="flood"></a>
+_ts3web_ can be deployed natively or via docker. It's recommended to use docker with docker-compose. Those steps are
+outlined below.
 
-### How to overcome server query limit?
+### docker-compose
 
-You might get one of these messages:
+General remarks:
 
-> I always get `flood client` message when clicking anywhere in the web interface.
+* By default, `/var/www/html/application/config/env` is used for bootstrapping necessary configuration, can be set to another parent directory with `ENV_DIR` in docker environment variable, e.g., `ENV_DIR=/data`
+* By default, `/var/www/html/application/data/snapshots` is used for storing snapshots, path can be changed in the `env` file with `snapshot_dir`
+* By default, `/var/www/html/application/log` is used for storing and reading logs, path can be changed in the `env` file with `log_dir`
+* Other `env` configuration values are outlined in the [env.example](./config/env.example) file which is also present in the default docker image.
 
-The web UI uses query commands _a lot_! When your instance is up and running, you should be able to change the following 
-setting, e.g. directly in your database (MySQL or sqlite).
+It's recommended to use the `network=HOST` option for the docker setup, and it will be the only example in this `README` file.
 
-```ini
-serverinstance_serverquery_flood_commands = 9999
-serverinstance_serverquery_max_connections_per_ip = 999
-serverinstance_serverquery_flood_time = 1
+Let's create the docker volumes first. You could also use automatically generated ones by the `docker-compose` file, you
+would need to remove the `external: true` in the `volumes` section of the `docker-compose.yml` then.
+
+Create the external volumes:
+
+```shell
+docker volume create ts3-vol
+docker volume create ts3web-vol
 ```
 
-<a name="whitelist"></a>
+Paste the example `docker-compose.yml` into a file on your machine:
 
-> I always get `TSException: Error: host isn't a ts3 instance!` when selecting a server.
-
-You're probably on a docker environment and the TeamSpeak server is queried through the web UI which
-resides behind a web server, so the TeamSpeak server thinks that the _remote web server IP address_ invokes the query 
-commands and thus blacklists it.
-
-You need define an exception for you server's IP in a [`whitelist.txt` file](#whitelist-text-file) and include it in 
-your TeamSpeak application.
-
-You can also add the desired IP to `query_ip_allowlist.txt` and `query_ip_whitelist.txt` within the TeamSpeak 3 Server 
-data directory (in example it's `./ts3server` where your `docker-compose.yml` resides).
-
-<a name="dockerperms"></a>
-
-### I always get `no write permissions` or something similar when trying to save snapshots or when a log entry is created.
-
-This probably happens when you're in the docker setup. Ensure that host binds have permissions set up properly. The user
-which is used in the docker container is `nobody` with id `65534`. If, e.g. logs are host bound, then execute
-`chown -R 65534:65534 host/path/to/log`. The same holds true for snapshots.
-
-## Configuration
-
-The main configuration file for the *web interface* is the `env` file located in `config/`. There's an example file
-called `env.example` which you **need** to copy to `config/env`. Defaults will assume you're running your TeamSpeak
-server on `localhost` with default port. Docker deployments can and *should* host bind this file into the container
-directly and just maintain the `env` file.
-
-## Deployment
-
-The application can be deployed two different ways. See below for more information. For each deployment type a running
-TeamSpeak 3 instance is a prerequisite.
-
-In the `docker-compose.yml` [example](#docker-compose), a setup together with a teamspeak server instance is shown.
-
-### Docker
-
-**Important. Read before setup!**
-
-1. [Setup write permissions if you're using host binds](#i-always-get-no-write-permissions-or-something-similar-when-trying-to-save-snapshots-or-when-a-log-entry-is-created)
-2. [Ensure that you increase `query commands usage` in your TeamSpeak server](#how-to-overcome-server-query-limit).
-3. [Use a `whitelist.txt` to ensure the web interface will not be query banned](#whitelist-text-file)
-4. Be aware that the web interface will not be able to use `localhost` as TeamSpeak 3 server address because it's not
-   available in a docker container. The public address also has to match the environment variable
-   `teamspeak_host=your-public-address` within the `env` file.
-
-#### docker standalone
-
-The following section outlines a manual setup. Feel free to use the provided `docker-compose.yml` as quick setup.
-
-1. Create docker volumes for `snapshots`, `log` and `env`. Alternative is to host bind them into your containers.
-2. Create a docker network with a fixed IP range or later use host network.
-3. Depending on your setup, you need to change `teamspeak_host` of your `env` file to point either to `your IP` or to a
-   `fixed docker IP` which your teamspeak uses. `localhost` is not valid if you're using it in docker. If you're unsure,
-   please take a look at the example `docker-compose.yml` files.
-4. Start a container using the docker image `varakh/ts3web` and provide the following bindings for volumes:
-    * `{env_file_volume|host_file}:/var/www/html/applicationconfig/env`
-    * `{snapshot_volume|host_folder}:/var/www/html/application/data/snapshots`
-    * `{log_volume|host_folder}:/var/www/html/application/log`
-5. [Ensure that you're whitelisting the IP from which the webinterface will issue commands.](#whitelist-text-file)
-6. Run the `docker run` command including your settings, volumes and networks (if
-   any): `docker run --name teamspeak_web -v ./env:/var/www/html/application/config/env -p 8181:80 varakh/ts3web:latest`
-   .
-
-#### docker-compose
-
-In order for TeamSpeak to show correct IP and country flags, the `network_mode = "host"` is advised. It's also possible
-to set everything up without using the host network mode and use fixed IPs.
-
-The examples will use host binds for volumes. Feel free to adapt the `docker-compose.yml` template and use docker
-volumes instead if you like.
-
-Ensure to [apply permissions](#i-always-get-no-write-permissions-or-something-similar-when-trying-to-save-snapshots-or-when-a-log-entry-is-created) for volumes though.
-
-<details>
-  <summary>docker host mode example</summary>
-
-```
+```yaml
 version: '2.1'
 networks:
   teamspeak:
     external: false
+
 services:
   app:
     container_name: teamspeak_app
     image: teamspeak:latest
     volumes:
-      - ./ts3server:/var/ts3server
-      - ./whitelist.txt:/whitelist.txt
-    ports:
-      - 10011:10011
-      - 30033:30033
-      - 9987:9987/udp
+      - ts3-vol:/var/ts3server
+    # ports are all public here in the HOST mode example
     environment:
       - TS3SERVER_LICENSE=accept
-      - TS3SERVER_IP_WHITELIST=/whitelist.txt
-    restart: always
+      - TS3SERVER_IP_WHITELIST=/var/ts3server/whitelist.txt
+    restart: unless-stopped
     network_mode: "host"
+
   web:
     container_name: teamspeak_web
     image: varakh/ts3web:latest
     volumes:
-      - ./env:/var/www/html/application/config/env
-      - ./snapshots:/var/www/html/application/data/snapshots
-      - ./log:/var/www/html/application/log
+      - ts3web-vol:/data
+    environment:
+      # volume needs to contain the env file!
+      - ENV_DIR=/data
     ports:
       - 127.0.0.1:8181:80
     depends_on:
       - app
-    restart: always
+    restart: unless-stopped
     networks:
       - teamspeak
-```
-</details>
 
-
-
-<details>
-  <summary>docker without host mode example</summary>
-
-```
-version: '2.1'
-networks:
-  teamspeak:
-    driver: bridge
-    ipam:
-     config:
-       - subnet: 10.5.0.0/16
-         gateway: 10.5.0.1
-
-services:
-  app:
-    container_name: teamspeak_app
-    image: teamspeak:latest
 volumes:
-      - ./ts3server:/var/ts3server
-      - ./whitelist.txt:/whitelist.txt
-    environment:
-      - TS3SERVER_LICENSE=accept
-      - TS3SERVER_IP_WHITELIST=/whitelist.txt
-    restart: always
-    ports:
-     - 10011:10011
-     - 30033:30033
-     - 9987:9987/udp
-    networks:
-      teamspeak:
-        ipv4_address: 10.5.0.5
-  web:
-    container_name: teamspeak_web
-    image: varakh/ts3web:latest
-    volumes:
-      - ./env:/var/www/html/application/config/env
-      - ./snapshots:/var/www/html/application/data/snapshots
-      - ./log:/var/www/html/application/log
-    ports:
-      - 127.0.0.1:8181:80
-    depends_on:
-      - app
-    restart: always
-    networks:
-      teamspeak:
-        ipv4_address: 10.5.0.6
-
-```
-</details>
-
-#### whitelist text file
-
-The following illustrates a valid `whitelist.txt` file which can be used for the above `docker-compose` setups. You need
-to replace `your-public-ip` with the TeamSpeak's public IP address if required or remove the fixed internal docker IP if
-you're on 'host' mode.
-
-```
-127.0.0.1
-::1
-10.5.0.5
-your-public-ip
+  ts3-vol:
+  ts3web-vol:
 ```
 
-Now execute `docker-compose up -d` to start those containers. If you like to update, do `docker-compose down`,
-`docker-compose pull` and then `docker-compose up -d` again.
+Let's populate our docker volumes **before** we start!
 
-Your TeamSpeak 3 Server will be available under `public-server-ip:9987`. The web interface will be available on
-`127.0.0.1:8181`. You need to add a [reverse proxy](#reverseproxy) and probably you also want SSL configured if you
-expose it via domain. For testing purposes, change `- 127.0.0.1:8181:80` to `- 8181:80`. The web interface will then be
-available under
-`public-server-ip:8181`.
+```shell
+docker run -d --rm --name ts3web_creator -v ts3web-vol:/mnt alpine tail -f /dev/null
+docker exec -it ts3web_creator sh
 
-This is **not recommended**! Secure your setup properly via [reverse proxy and SSL](#reverse-proxy).
+# inside the container, edit the env by copying the example to the docker volume mount path at /data/env
+cp /var/www/html/application/config/env /data/env
 
-### As native PHP application
+# edit the env file to your liking
+#
+# the teamspeak_host should point to your public ip address and must be whitelisted inside the teamspeak server itself
+vi env
 
-**Prerequisite**: `php`, `composer` and probably `php-fpm` installed on the server.
+# create necessary directories and set permissions
+mkdir -p /data/log
+touch /data/log/application.log
+mkdir -p /data/snapshots
+chown -R 65534:65534 /data
 
-#### Install:
+# exit the container
+exit
 
-* Clone repository
-* Change directory to project home
-* Execute `composer install`
-* `composer install`
-* Do the configuration by coping the `env.example` file (see information above)
-* Use a web server _or_ run directly via the embedded PHP server: `php -S localhost:8080 -t public public/index.php`.
-* Point your browser to [localhost:8080](http://localhost:8080)
-* Apply any [whitelist.txt](#whitelist-text-file) changes if you configured `teamspeak_host` differently
-  than `localhost`
+# on the host system, stop the creator container
+docker stop ts3web_creator
+```
 
-#### Upgrade:
+Let's populate the teamspeak container with a proper `whitelist.txt` file. See [ensure that you're whitelisting the IP from which the webinterface will issue commands](#whitelisttextfile).
 
-* Change directory to project home
-* `git pull`
-* `composer update`
+```shell
+docker run -d --rm --name ts3_creator -v ts3-vol:/mnt alpine tail -f /dev/null
+docker exec -it ts3_creator sh
+
+# edit the whitelist.txt file at /var/ts3server/whitelist.txt
+# it should contain the following entries
+#
+# 127.0.0.1
+# ::1
+# your-public-ip
+#
+vi /var/ts3server/whitelist.txt
+
+# exit the container
+exit
+
+# on the host system, stop the creator container
+docker stop ts3_creator
+```
+
+Maybe you like to copy valid license files into the `ts3-vol` docker volume before stopping.
+
+_Finally_, start the stack with `docker-compose up -d`. Please see the **Reverse proxy** section for a nginx example.
 
 ### Reverse proxy
 
 Here's an example on how to configure a reverse proxy for the web interface docker container
 
-  ```  
+```shell
 root   .../public;
 index index.php;   
 
@@ -281,17 +185,84 @@ Here's an example on how to configure a reverse proxy for the web interface dock
 }
 ```
 
-## Limitations
+## Native application
 
-TeamSpeak has a detailed interface for permissions and uploading files, therefore the following features are not
-supported:
+**Prerequisite**: `php`, `composer` and probably `php-fpm` installed on the server.
 
-* uploading files (only viewing and deleting, use the official client for uploading)
-* editing permissions (only viewing, use the client for editing)
+### Install
+
+* Clone repository
+* Change directory to project home
+* Execute `composer install`
+* `composer install`
+* Do the configuration by coping the `env.example` file (see information above)
+* Use a web server _or_ run directly via the embedded PHP server: `php -S localhost:8080 -t public public/index.php`.
+* Point your browser to [localhost:8080](http://localhost:8080)
+* Apply any [whitelist.txt](#whitelist-text-file) changes if you configured `teamspeak_host` differently
+  than `localhost`
+
+### Upgrade
+
+* Change directory to project home
+* `git pull`
+* `composer update`
+
+## Troubleshooting / F.A.Q
+
+<a name="flood"></a>
+### How to overcome server query limit?
+
+You might get one of these messages:
+
+> I always get `flood client` message when clicking anywhere in the web interface.
+
+The web UI uses query commands _a lot_! When your instance is up and running, you should be able to change the following
+setting, e.g. directly in your database (MySQL or sqlite).
+
+```ini
+serverinstance_serverquery_flood_commands = 9999
+serverinstance_serverquery_max_connections_per_ip = 999
+serverinstance_serverquery_flood_time = 1
+```
+
+<a name="whitelist"></a>
+> I always get `TSException: Error: host isn't a ts3 instance!` when selecting a server.
+
+You're probably on a docker environment and the TeamSpeak server is queried through the web UI which
+resides behind a web server, so the TeamSpeak server thinks that the _remote web server IP address_ invokes the query
+commands and thus blacklists it.
+
+You need define an exception for you server's IP in a [`whitelist.txt`](#whitelisttextfile) file and include it in
+your TeamSpeak application.
+
+You can also add the desired IP to `query_ip_allowlist.txt` and `query_ip_whitelist.txt` within the TeamSpeak 3 Server
+data directory.
+
+<a name="dockerperms"></a>
+### I always get `no write permissions` or something similar when trying to save snapshots or when a log entry is created.
+
+This probably happens when you're in the docker setup. Ensure that host binds have permissions set up properly and also files inside any
+docker volume has the correct permissions. The user which is used in the docker container is `nobody` with id `65534`.
+
+Change owner permissions recursively with `chown -R 65534:65534 /path/to/dir`.
+
+<a name="whitelisttextfile"></a>
+### What's a whitelist.txt and why do I need it?
+
+The following illustrates a valid `whitelist.txt` file which can be used for the above `docker-compose` setups. You need
+to replace `your-public-ip` with the TeamSpeak's public IP address if required or remove the fixed internal docker IP if
+you're on 'host' mode.
+
+```
+127.0.0.1
+::1
+10.5.0.5
+your-public-ip
+```
 
 ## Development
 
-If you're willing to contribute, here's some information.
+Contributions are welcome!
 
 ### Release
 

composer.lock

@@ -439,12 +439,12 @@
             },
             "type": "library",
             "autoload": {
-                "psr-4": {
-                    "FastRoute\\": "src/"
-                },
                 "files": [
                     "src/functions.php"
-                ]
+                ],
+                "psr-4": {
+                    "FastRoute\\": "src/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1075,16 +1075,16 @@
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.24.0",
+            "version": "v1.27.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "30885182c981ab175d4d034db0f6f469898070ab"
+                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab",
-                "reference": "30885182c981ab175d4d034db0f6f469898070ab",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a",
+                "reference": "5bbc823adecdae860bb64756d639ecfec17b050a",
                 "shasum": ""
             },
             "require": {
@@ -1099,7 +1099,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.27-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -1107,12 +1107,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1137,7 +1137,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0"
             },
             "funding": [
                 {
@@ -1153,20 +1153,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-10-20T20:35:02+00:00"
+            "time": "2022-11-03T14:55:06+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.24.0",
+            "version": "v1.27.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825"
+                "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825",
-                "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
+                "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534",
                 "shasum": ""
             },
             "require": {
@@ -1181,7 +1181,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.27-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -1189,12 +1189,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1220,7 +1220,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0"
             },
             "funding": [
                 {
@@ -1236,20 +1236,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-11-30T18:21:41+00:00"
+            "time": "2022-11-03T14:55:06+00:00"
         },
         {
             "name": "symfony/polyfill-php72",
-            "version": "v1.24.0",
+            "version": "v1.27.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "9a142215a36a3888e30d0a9eeea9766764e96976"
+                "reference": "869329b1e9894268a8a61dabb69153029b7a8c97"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976",
-                "reference": "9a142215a36a3888e30d0a9eeea9766764e96976",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97",
+                "reference": "869329b1e9894268a8a61dabb69153029b7a8c97",
                 "shasum": ""
             },
             "require": {
@@ -1258,7 +1258,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "1.23-dev"
+                    "dev-main": "1.27-dev"
                 },
                 "thanks": {
                     "name": "symfony/polyfill",
@@ -1266,12 +1266,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php72\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php72\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1296,7 +1296,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php72/tree/v1.24.0"
+                "source": "https://github.com/symfony/polyfill-php72/tree/v1.27.0"
             },
             "funding": [
                 {
@@ -1312,7 +1312,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-27T09:17:38+00:00"
+            "time": "2022-11-03T14:55:06+00:00"
         },
         {
             "name": "symfony/translation",
@@ -1545,16 +1545,16 @@
         },
         {
             "name": "twig/twig",
-            "version": "v2.14.10",
+            "version": "v2.15.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "95fb194cd4dd6ac373a27af2bde2bad5d3f27aba"
+                "reference": "ab402673db8746cb3a4c46f3869d6253699f614a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/95fb194cd4dd6ac373a27af2bde2bad5d3f27aba",
-                "reference": "95fb194cd4dd6ac373a27af2bde2bad5d3f27aba",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/ab402673db8746cb3a4c46f3869d6253699f614a",
+                "reference": "ab402673db8746cb3a4c46f3869d6253699f614a",
                 "shasum": ""
             },
             "require": {
@@ -1570,7 +1570,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.14-dev"
+                    "dev-master": "2.15-dev"
                 }
             },
             "autoload": {
@@ -1609,7 +1609,7 @@
             ],
             "support": {
                 "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v2.14.10"
+                "source": "https://github.com/twigphp/Twig/tree/v2.15.3"
             },
             "funding": [
                 {
@@ -1621,7 +1621,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-03T21:13:26+00:00"
+            "time": "2022-09-28T08:40:08+00:00"
         },
         {
             "name": "vlucas/phpdotenv",
@@ -1739,12 +1739,12 @@
             },
             "type": "library",
             "autoload": {
-                "psr-0": {
-                    "cli": "lib/"
-                },
                 "files": [
                     "lib/cli/cli.php"
-                ]
+                ],
+                "psr-0": {
+                    "cli": "lib/"
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [

config/Constants.php

@@ -8,12 +8,12 @@ class Constants
     /**
      * Years tag
      */
-    const YEARS = '2020-2022';
+    const YEARS = '2020-2023';
 
     /**
      * Version tag
      */
-    const VERSION = '2.2.4';
+    const VERSION = '2.2.6';
 
     /**
      * Return constant by its class name

config/EnvConstants.php

@@ -8,12 +8,27 @@ class EnvConstants
     /**
      * Example env file
      */
-    const ENV_FILE_EXAMPLE = "env.example";
+    const FILE_NAME_EXAMPLE_ENV = "env.example";
 
     /**
      * Custom env file
      */
-    const ENV_FILE = "env";
+    const FILE_NAME_ENV = "env";
+
+    /**
+     * The path to the env file
+     */
+    const ENV_DIR = "ENV_DIR";
+
+    /**
+     * The path to the logs directory
+     */
+    const LOG_DIR = "log_dir";
+
+    /**
+     * The path to the snapshots directory
+     */
+    const SNAPSHOT_DIR = "snapshot_dir";
 
     /**
      * Site title
@@ -31,7 +46,7 @@ class EnvConstants
     const SITE_DATE_FORMAT = "site_date_format";
 
     /**
-     * THeme
+     * Theme
      */
     const THEME = "theme";
 

config/env.example

@@ -8,12 +8,16 @@ theme="bootstrap4" # values: bootstrap4 (foldernames are used to determine theme
 theme_cache=false # values: true|false (cache view/twig. makes it faster, disable for debug)
 
 # teamspeak
-teamspeak_host="localhost" # 'localhost' or 'name_of_docker_container' if running locally
+teamspeak_host="app" # 'localhost' or 'name_of_docker_container|name_of_the_docker-compose_service' if running locally
 teamspeak_query_port=10011
 teamspeak_user="serveradmin"
 teamspeak_tree_view="true" # show a tree view in the details of online clients if a server has been selected
 teamspeak_log_lines=100 # show this amount of latest log lines
 
 # log
+log_dir=/var/www/html/application/log
 log_name="ts3web" # values: all strings
 log_level="INFO" # values: DEBUG, INFO, NOTICE, WARNING, ERROR, CRITICAL, ALERT, EMERGENCY
+
+# snapshots
+snapshot_dir=/var/www/html/application/data/snapshots

docker/configure.php

@@ -0,0 +1,22 @@
+#!/usr/bin/env php
+<?php
+
+echo "Adapting ENV_DIR..." . PHP_EOL;
+
+$path = '/etc/php7/php-fpm.d/www.conf';
+$env = "ENV_DIR";
+
+$fileContent = file_get_contents($path);
+$fileContent = preg_replace("/%%%" . strtoupper($env) . "%%%/", env($env, "/var/www/html/application/config"), $fileContent);
+file_put_contents($path, $fileContent);
+
+function env($name, $default = null)
+{
+    $v = getenv($name) ?: $default;
+
+    if ($v === null) {
+        return "''";
+    }
+
+    return "'" . $v . "'";
+}