Browse Source

Simplify the config, since default /etc/apache2/sites-enabled/000-default.conf already exists

Alex Trofimov 2 năm trước cách đây
mục cha
commit
96ee468ec1
1 tập tin đã thay đổi với 1 bổ sung và 27 xóa
  1. 1 27
      Dockerfile

+ 1 - 27
Dockerfile

@@ -53,36 +53,10 @@ error_reporting=E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT \n\
 display_errors=Off \n\
 log_errors=On \n\
 sendmail_path=/usr/sbin/sendmail -t -i \n\
-date.timezone=UTC" > /var/www/php.ini && chown www-una:www-una /var/www/php.ini
+date.timezone=UTC" > /usr/local/etc/php/conf.d/una.ini
 
 RUN mkdir /var/log/php && mkdir /var/www/ssl && chown www-una:www-una /var/log/php && chmod 777 /var/log/php && su www-una -c "ln -s /dev/stderr /var/log/php/error.log"
 
-RUN echo "<VirtualHost *:80> \n\
-        DocumentRoot /var/www/html \n\
-        PHPINIDir /var/www \n\
-        ErrorLog /var/www/error.log \n\
-        CustomLog /var/www/access.log combined \n\
-</VirtualHost>" > /etc/apache2/sites-available/una_http.conf; \
-echo "<VirtualHost *:80> \n\
-        RewriteEngine On \n\
-        RewriteCond %{HTTPS} !=on \n\
-        RewriteRule ^/(.*) https://%{SERVER_NAME}/\$1 [R,L] \n\
-</VirtualHost>" > /etc/apache2/sites-available/una_http_redir.conf; \
-echo "<VirtualHost *:443> \n\
-        Alias /.well-known /var/www/html/.well-known \n\
-        SSLCertificateFile /var/www/ssl/cert.pem \n\
-        SSLCertificateKeyFile /var/www/ssl/privkey.pem \n\
-        SSLCertificateChainFile /var/www/ssl/fullchain.pem \n\
-        SSLEngine on \n\
-        Protocols h2 http/1.1 \n\
-        DocumentRoot /var/www/html \n\
-        PHPINIDir /var/www \n\
-        ErrorLog /var/www/error.log \n\
-        CustomLog /var/www/access.log combined \n\
-</VirtualHost>" > /etc/apache2/sites-available/una_https.conf; \
-ln -s /etc/apache2/sites-available/una_http.conf /etc/apache2/sites-enabled/una_http.conf
-# ln -s /etc/apache2/sites-available/una_https.conf /etc/apache2/sites-enabled/una_https.conf; ln -s /etc/apache2/sites-available/una_http_redir.conf /etc/apache2/sites-enabled/una_http_redir.conf 
-
 RUN a2enmod rewrite expires ssl
 
 # Expose port and set volume