-REVERT COMMIT

Dockerfile

@@ -14,13 +14,11 @@ FROM php:apache
 
 ARG NODE_ENV
 ENV COMPOSER_ALLOW_SUPERUSER=1
-ARG NODE_ENV
 
 EXPOSE 80
 WORKDIR /var/www/html/
 
 RUN apt-get update -qq && \
-    apt install libapache2-mod-brotli && \
     apt-get install -qy \
     git \
     gnupg \
@@ -45,7 +43,6 @@ RUN mkdir -p /var/www/html/db/
 RUN chmod -R 777 /var/www/html/db/
 RUN chmod -R 777 /var/www/html/file/
 RUN a2enmod rewrite
-RUN a2enmod brotli
 RUN a2enmod remoteip && \
     a2enconf swag && \
     /etc/init.d/apache2 restart

config/demo/apache2/apache2.conf

@@ -222,9 +222,4 @@ LogFormat "%{User-agent}i" agent
 IncludeOptional conf-enabled/*.conf
 
 # Include the virtual host configurations:
-IncludeOptional sites-enabled/*.conf
-
-# vim: syntax=apache ts=4 sw=4 sts=4 sr noet
-<IfModule mod_brotli.c>
-    AddOutputFilterByType BROTLI_COMPRESS text/html text/plain text/xml text/css application/javascript application/x-javascript application/json application/xml application/xhtml+xml application/rss+xml application/atom+xml application/rdf+xml application/x-font-ttf application/x-font-opentype application/font-woff application/vnd.ms-fontobject image/svg+xml
-</IfModule>
+IncludeOptional sites-enabled/*.conf

config/prod/apache2/apache2.conf

@@ -149,10 +149,6 @@ IncludeOptional mods-enabled/*.conf
 # Include list of ports to listen on
 Include ports.conf
 
-<IfModule mod_brotli.c>
-    AddOutputFilterByType BROTLI_COMPRESS text/html text/plain text/xml text/css application/javascript application/x-javascript application/json application/xml application/xhtml+xml application/rss+xml application/atom+xml application/rdf+xml application/x-font-ttf application/x-font-opentype application/font-woff application/vnd.ms-fontobject image/svg+xml
-</IfModule>
-
 # 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,