Merge pull request 'Added fix for issues found while setting up anhonesthost' (#17) from update-to-fix-ip-and-options-issue into trunk
Some checks failed
Cloud Apache Container / Build-and-Push (push) Failing after 8s
Some checks failed
Cloud Apache Container / Build-and-Push (push) Failing after 8s
Reviewed-on: #17
This commit is contained in:
commit
9630408ca0
@ -18,6 +18,7 @@ COPY ./configs/prod-php.ini /etc/php.ini
|
|||||||
COPY ./configs/phpinfo.php /var/www/html/
|
COPY ./configs/phpinfo.php /var/www/html/
|
||||||
COPY ./configs/mariadb.repo /etc/yum.repos.d/
|
COPY ./configs/mariadb.repo /etc/yum.repos.d/
|
||||||
COPY ./configs/index.php /var/www/html/
|
COPY ./configs/index.php /var/www/html/
|
||||||
|
COPY ./remote_ip.conf /etc/httpd/conf.d/
|
||||||
RUN echo "15 */12 * * * root /scripts/log-rotate.sh" >> /etc/crontab
|
RUN echo "15 */12 * * * root /scripts/log-rotate.sh" >> /etc/crontab
|
||||||
RUN yum clean all
|
RUN yum clean all
|
||||||
ENTRYPOINT [ "/scripts/entrypoint.sh" ]
|
ENTRYPOINT [ "/scripts/entrypoint.sh" ]
|
||||||
|
2
configs/remote_ip.conf
Normal file
2
configs/remote_ip.conf
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
RemoteIPHeader X-Forwarded-For
|
||||||
|
LogFormat "%a %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
|
@ -14,6 +14,9 @@ mv /var/log/httpd /var/log/httpd.bak
|
|||||||
ln -s /home/$user/logs/apache /var/log/httpd
|
ln -s /home/$user/logs/apache /var/log/httpd
|
||||||
ln -s /home/$user/logs/php-fpm /var/log/php-fpm
|
ln -s /home/$user/logs/php-fpm /var/log/php-fpm
|
||||||
|
|
||||||
|
rm -f /etc/httpd/conf.d/userdir.conf
|
||||||
|
docker_network=$(ip addr show |grep eth0 |grep inet |awk -F " " {'print $2'})
|
||||||
|
echo "RemoteIPInternalProxy $docker_network" >> /etc/httpd/conf.d/remoteip.conf
|
||||||
/scripts/install-php$PHPVER.sh
|
/scripts/install-php$PHPVER.sh
|
||||||
|
|
||||||
/scripts/create-vhost.sh
|
/scripts/create-vhost.sh
|
||||||
|
Loading…
Reference in New Issue
Block a user