diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2019-03-02 21:49:20 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2019-03-02 21:49:20 +0100 |
| commit | fc8fb0a7ee0d98f8c31be3bd6e76719ebb0e68ee (patch) | |
| tree | b76e72a4463873280b2b64579408e95c1ac51c61 /Docker/FreshRSS.Apache.conf | |
| parent | b869c2944a01c5060d05a093d5e0c797d48bb159 (diff) | |
Docker image alternative using Ubuntu (#2205)
* Docker image alternative using Ubuntu
Ubuntu seems to be faster, cf. e.g. PHPBench.
It is quite usual for Docker images to offer both a Debian/Ubuntu and an
Alpine version, so we could also do the same if there is any need.
Follow-up of https://github.com/FreshRSS/FreshRSS/pull/2202
* Only explicit use of Apache confs
Fix double-logging issue
* Explicit ServerTokens OS
Default Apache configuration in Ubuntu, which was removed when disabling all confs.
It is also the default Apache configuration in Alpine.
* Take advantage of syslog for actualization
Same than for Alpine
https://github.com/FreshRSS/FreshRSS/pull/2208/commits/43ab629e27799cb28ec28ad409a512e128d11e97
* COPY_SYSLOG_TO_STDERR
Same as https://github.com/FreshRSS/FreshRSS/pull/2213
* Update to libapache2-mod-php instead of php-fpm
* Default to Ubuntu
Ubuntu mod-php wins, being ~14% faster than Ubuntu php-fpm (which was ~300% faster than Alpine mod-php)
Diffstat (limited to 'Docker/FreshRSS.Apache.conf')
| -rw-r--r-- | Docker/FreshRSS.Apache.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Docker/FreshRSS.Apache.conf b/Docker/FreshRSS.Apache.conf index 80f6389d8..6621ff16f 100644 --- a/Docker/FreshRSS.Apache.conf +++ b/Docker/FreshRSS.Apache.conf @@ -4,6 +4,7 @@ DocumentRoot /var/www/FreshRSS/p/ CustomLog /dev/stdout combined ErrorLog /dev/stderr AllowEncodedSlashes On +ServerTokens OS <Directory /> AllowOverride None |