Merge pull request 'cleanup' (#3) from testing into main

Reviewed-on: #3

Dockerfile

@@ -97,15 +97,34 @@ RUN apt-get -y purge \
 # Configure Apache
 
 RUN set -eux; \
-    docker-php-ext-enable opcache; \
+    a2enmod alias authz_core deflate filter rewrite expires setenvif remoteip headers; \
+    docker-php-ext-enable opcache;
+
+RUN set -eux; \
     { \
-        echo 'opcache.memory_consumption=128'; \
+        echo 'opcache.save_comments=1'; \
-        echo 'opcache.interned_strings_buffer=8'; \
+        echo 'opcache.use_cwd=1'; \
-        echo 'opcache.max_accelerated_files=4000'; \
+        echo 'opcache.validate_timestamps=1'; \
-        echo 'opcache.revalidate_freq=2'; \
+        echo 'opcache.max_accelerated_files=10000'; \
+        echo 'opcache.revalidate_freq=30'; \
+        echo 'opcache.revalidate_path=0'; \
     } > /usr/local/etc/php/conf.d/opcache-recommended.ini
 
-RUN { \
+RUN set -eux; \
+    { \
+        echo 'memory_limit=256M'; \
+        echo 'max_execution_time=240'; \
+        echo 'max_input_vars=1500'; \
+    } > /usr/local/etc/php/conf.d/typo3-recommended.ini
+
+RUN set -eux; \
+    { \
+        echo 'post_max_size=10M'; \
+        echo 'upload_max_filesize=10M'; \
+    } > /usr/local/etc/php/conf.d/upload-recommended.ini
+
+RUN set -eux; \
+    { \
         echo 'error_reporting = E_ERROR | E_WARNING | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING | E_RECOVERABLE_ERROR'; \
         echo 'display_errors = Off'; \
         echo 'display_startup_errors = Off'; \
@@ -118,7 +137,6 @@ RUN { \
     } > /usr/local/etc/php/conf.d/error-logging.ini
 
 RUN set -eux; \
-    a2enmod rewrite expires remoteip headers; \
     { \
         echo 'RemoteIPHeader X-Forwarded-For'; \
 # these IP ranges are reserved for "private" use and should thus *usually* be safe inside Docker
@@ -131,6 +149,8 @@ RUN set -eux; \
     a2enconf remoteip; \
     find /etc/apache2 -type f -name '*.conf' -exec sed -ri 's/([[:space:]]*LogFormat[[:space:]]+"[^"]*)%h([^"]*")/\1%a\2/g' '{}' +
 
+RUN cp ${PHP_INI_DIR}/php.ini-production ${PHP_INI_DIR}/php.ini
+
 # install TYPO3 surf
 # RUN mkdir /usr/local/surf && \
 #    curl -L https://github.com/TYPO3/Surf/releases/download/3.4.6/surf.phar -o /usr/local/surf/surf.phar && \

apache-conf/apache.conf

@@ -1,246 +0,0 @@
-# This is the main Apache server configuration file.  It contains the
-# configuration directives that give the server its instructions.
-# See http://httpd.apache.org/docs/2.4/ for detailed information about
-# the directives and /usr/share/doc/apache2/README.Debian about Debian specific
-# hints.
-#
-#
-# Summary of how the Apache 2 configuration works in Debian:
-# The Apache 2 web server configuration in Debian is quite different to
-# upstream's suggested way to configure the web server. This is because Debian's
-# default Apache2 installation attempts to make adding and removing modules,
-# virtual hosts, and extra configuration directives as flexible as possible, in
-# order to make automating the changes and administering the server as easy as
-# possible.
-
-# It is split into several files forming the configuration hierarchy outlined
-# below, all located in the /etc/apache2/ directory:
-#
-#	/etc/apache2/
-#	|-- apache2.conf
-#	|	`--  ports.conf
-#	|-- mods-enabled
-#	|	|-- *.load
-#	|	`-- *.conf
-#	|-- conf-enabled
-#	|	`-- *.conf
-# 	`-- sites-enabled
-#	 	`-- *.conf
-#
-#
-# * apache2.conf is the main configuration file (this file). It puts the pieces
-#   together by including all remaining configuration files when starting up the
-#   web server.
-#
-# * ports.conf is always included from the main configuration file. It is
-#   supposed to determine listening ports for incoming connections which can be
-#   customized anytime.
-#
-# * Configuration files in the mods-enabled/, conf-enabled/ and sites-enabled/
-#   directories contain particular configuration snippets which manage modules,
-#   global configuration fragments, or virtual host configurations,
-#   respectively.
-#
-#   They are activated by symlinking available configuration files from their
-#   respective *-available/ counterparts. These should be managed by using our
-#   helpers a2enmod/a2dismod, a2ensite/a2dissite and a2enconf/a2disconf. See
-#   their respective man pages for detailed information.
-#
-# * The binary is called apache2. Due to the use of environment variables, in
-#   the default configuration, apache2 needs to be started/stopped with
-#   /etc/init.d/apache2 or apache2ctl. Calling /usr/bin/apache2 directly will not
-#   work with the default configuration.
-
-
-# Global configuration
-#
-
-#
-# ServerRoot: The top of the directory tree under which the server's
-# configuration, error, and log files are kept.
-#
-# NOTE!  If you intend to place this on an NFS (or otherwise network)
-# mounted filesystem then please read the Mutex documentation (available
-# at <URL:http://httpd.apache.org/docs/2.4/mod/core.html#mutex>);
-# you will save yourself a lot of trouble.
-#
-# Do NOT add a slash at the end of the directory path.
-#
-#ServerRoot "/etc/apache2"
-
-#
-# The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
-#
-#Mutex file:${APACHE_LOCK_DIR} default
-
-#
-# The directory where shm and other runtime files will be stored.
-#
-
-DefaultRuntimeDir ${APACHE_RUN_DIR}
-
-#
-# PidFile: The file in which the server should record its process
-# identification number when it starts.
-# This needs to be set in /etc/apache2/envvars
-#
-PidFile ${APACHE_PID_FILE}
-
-#
-# Timeout: The number of seconds before receives and sends time out.
-#
-Timeout 260
-
-#
-# KeepAlive: Whether or not to allow persistent connections (more than
-# one request per connection). Set to "Off" to deactivate.
-#
-KeepAlive On
-
-#
-# MaxKeepAliveRequests: The maximum number of requests to allow
-# during a persistent connection. Set to 0 to allow an unlimited amount.
-# We recommend you leave this number high, for maximum performance.
-#
-MaxKeepAliveRequests 100
-
-#
-# KeepAliveTimeout: Number of seconds to wait for the next request from the
-# same client on the same connection.
-#
-KeepAliveTimeout 5
-
-
-# These need to be set in /etc/apache2/envvars
-User ${APACHE_RUN_USER}
-Group ${APACHE_RUN_GROUP}
-
-#
-# HostnameLookups: Log the names of clients or just their IP addresses
-# e.g., www.apache.org (on) or 204.62.129.132 (off).
-# The default is off because it'd be overall better for the net if people
-# had to knowingly turn this feature on, since enabling it means that
-# each client request will result in AT LEAST one lookup request to the
-# nameserver.
-#
-HostnameLookups Off
-
-# ErrorLog: The location of the error log file.
-# If you do not specify an ErrorLog directive within a <VirtualHost>
-# container, error messages relating to that virtual host will be
-# logged here.  If you *do* define an error logfile for a <VirtualHost>
-# container, that host's errors will be logged there and not here.
-#
-ErrorLog ${APACHE_LOG_DIR}/error.log
-
-#
-# LogLevel: Control the severity of messages logged to the error_log.
-# Available values: trace8, ..., trace1, debug, info, notice, warn,
-# error, crit, alert, emerg.
-# It is also possible to configure the log level for particular modules, e.g.
-# "LogLevel info ssl:warn"
-#
-LogLevel warn
-
-# Include module configuration:
-IncludeOptional mods-enabled/*.load
-IncludeOptional mods-enabled/*.conf
-
-# Include list of ports to listen on
-Include ports.conf
-
-
-# Sets the default security model of the Apache2 HTTPD server. It does
-# not allow access to the root filesystem outside of /usr/share and /var/www.
-# The former is used by web applications packaged in Debian,
-# the latter may be used for local directories served by the web server. If
-# your system is serving content from a sub-directory in /srv you must allow
-# access here, or in any related virtual host.
-<Directory />
-	Options FollowSymLinks
-	AllowOverride None
-	Require all denied
-</Directory>
-
-<Directory /usr/share>
-	AllowOverride None
-	Require all granted
-</Directory>
-
-<Directory /var/www/>
-	Options Indexes FollowSymLinks
-	AllowOverride None
-	Require all granted
-</Directory>
-<Directory /home/www/>
-	Options FollowSymLinks
-	AllowOverride None
-	Require all denied
-</Directory>
-
-
-
-#<Directory /srv/>
-#	Options Indexes FollowSymLinks
-#	AllowOverride None
-#	Require all granted
-#</Directory>
-
-
-
-
-# AccessFileName: The name of the file to look for in each directory
-# for additional configuration directives.  See also the AllowOverride
-# directive.
-#
-AccessFileName .htaccess
-
-#
-# The following lines prevent .htaccess and .htpasswd files from being
-# viewed by Web clients.
-#
-<FilesMatch "^\.ht">
-	Require all denied
-</FilesMatch>
-
-
-#
-# The following directives define some format nicknames for use with
-# a CustomLog directive.
-#
-# These deviate from the Common Log Format definitions in that they use %O
-# (the actual bytes sent including headers) instead of %b (the size of the
-# requested file), because the latter makes it impossible to detect partial
-# requests.
-#
-# Note that the use of %{X-Forwarded-For}i instead of %h is not recommended.
-# Use mod_remoteip instead.
-#
-LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
-LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
-LogFormat "%h %l %u %t \"%r\" %>s %O" common
-LogFormat "%{Referer}i -> %U" referer
-LogFormat "%{User-agent}i" agent
-
-Header set X-XSS-Protection "1; mode=block"	
-Header always set X-Frame-Options "SAMEORIGIN"
-Header always set Strict-Transport-Security "max-age=31536000; includeSubDomains; preload"
-Header always set Referrer-Policy "same-origin"
-Header always set Permissions-Policy "geolocation=(),midi=(),sync-xhr=(),microphone=(),camera=(),magnetometer=(),gyroscope=(),fullscreen=(self),payment=()"
-Header always set X-Content-Type-Options "nosniff"
-
-# Include of directories ignores editors' and dpkg's backup files,
-# see README.Debian for details.
-
-# Include generic snippets of statements
-IncludeOptional conf-enabled/*.conf
-
-# Include the virtual host configurations:
-IncludeOptional sites-enabled/*.conf
-
-# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
-
-# hide apache version
-ServerSignature Off
-ServerTokens Prod
-

docker-compose.yml

@@ -13,6 +13,7 @@ services:
     container_name: "${PROJECT_NAME}_typo3"
     hostname: "${PROJECT_URL}"
     build: .
+    user: "1000"
     networks:
       - "traefik"
       - "default"
@@ -22,9 +23,10 @@ services:
       - "${PROJECT_DATA}/${PROJECT_NAME}-typo3/protected:/var/www/protected"
       - "${PROJECT_DATA}/${PROJECT_NAME}-typo3/typo3conf:/var/www/html/typo3conf"
       - "./apache-conf/sites-enabled:/etc/apache2/sites-enabled"
+     # - "./php-conf/conf.d:/usr/local/etc/php/conf.d"
       - "./php-conf/php.ini:/usr/local/etc/php/php.ini:ro"
       ## use for the first install
-      # - "./LICENSE:/var/www/html/FIRST_INSTALL:ro"
+      - "./LICENSE:/var/www/html/FIRST_INSTALL:ro"
       - "/etc/timezone:/etc/timezone:ro"
       - "/etc/localtime:/etc/localtime:ro"
     depends_on:
@@ -50,7 +52,7 @@ services:
       - "--collation-server=utf8mb4_unicode_ci"
     env_file: ".env"
     volumes: 
-    - "${PROJECT_DATA}/${PROJECT_NAME}-typo3/db:/var/lib/mysql"
+      - "${PROJECT_DATA}/${PROJECT_NAME}-typo3/db:/var/lib/mysql"
     labels:
       # Watchtower add to auto update
       - "com.centurylinklabs.watchtower.enable=true"

init

@@ -2,7 +2,6 @@
 
 source ./.env
 
-
 mkdir -p ${PROJECT_DATA}/${PROJECT_NAME}-typo3/fileadmin
 mkdir -p ${PROJECT_DATA}/${PROJECT_NAME}-typo3/uploads
 mkdir -p ${PROJECT_DATA}/${PROJECT_NAME}-typo3/protected