Skip to content
Snippets Groups Projects
Commit e4545856 authored by Maarten de Waard's avatar Maarten de Waard :angel: Committed by Arie Peterson
Browse files

Resolve "/wp-admin redirects to :8080"

parent 3a61bb09
No related branches found
No related tags found
1 merge request!134Resolve "/wp-admin redirects to :8080"
## [0.6.15] - 2022-03-29
- Fix wrong redirect to port 8080
## [0.6.3-0.6.14] - 2022-02-27 to 2022-03-28
- Update Helm release Redis to v16.7.0
- Update Helm release mariadb to v10.4.4
- And updates to those Helm Releases to intermediate versions
- Allow uploading SVG files
- Do not install classic editor plugin by default
## [0.6.2] - 2022-02-25
- Set correct tags for Wordpress containers
......
......@@ -5,7 +5,7 @@ description: WordPress with a replicated MariaDB backend
name: wordpress
# Please only change the chart version as part of the release procedure: see
# RELEASING.md
version: 0.6.14
version: 0.6.15
icon: https://make.wordpress.org/design/files/2016/09/WordPress-logotype-wmark.png
dependencies:
- name: mariadb
......
......@@ -237,13 +237,13 @@ ansibleVars:
image:
repository: open.greenhost.net:4567/stackspin/wordpress-helm/wordpress
tag: 0.6.2
tag: 0.6.15
pullPolicy: Always
pullSecrets: []
initImage:
repository: open.greenhost.net:4567/stackspin/wordpress-helm/wordpress-cli-ansible
tag: 0.6.2
tag: 0.6.15
pullPolicy: Always
ingress:
......
......@@ -23,10 +23,16 @@ ENV PORT 8080
ENV TLS_PORT 8443
ENV TRUSTED_PROXY_IP 10.0.0.0/8
RUN sed -i "s/\<80\>/$PORT/g" /etc/apache2/sites-available/000-default.conf /etc/apache2/ports.conf
RUN sed -i "s/\<443\>/$TLS_PORT/g" /etc/apache2/sites-available/default-ssl.conf /etc/apache2/ports.conf
RUN sed "s/\tCustomLog \${APACHE_LOG_DIR}\/access.log combined/\tCustomLog \${APACHE_LOG_DIR}\/access.log remoteip/g" /etc/apache2/sites-available/000-default.conf /etc/apache2/sites-available/default-ssl.conf
# Remove port numbers from VirtualHosts
RUN sed -i "s/:80//g" /etc/apache2/sites-available/000-default.conf
RUN sed -i "s/:443//g" /etc/apache2/sites-available/default-ssl.conf
# Set correct port in ports.conf
RUN sed -i "s/\<80\>/$PORT/g" /etc/apache2/ports.conf
RUN sed -i "s/\<443\>/$TLS_PORT/g" /etc/apache2/ports.conf
# Log remote IP addresses instead of the LoadBalancer IP
RUN sed "s/\tCustomLog \${APACHE_LOG_DIR}\/access.log combined/\tCustomLog \${APACHE_LOG_DIR}\/access.log remoteip/g" /etc/apache2/sites-available/000-default.conf /etc/apache2/sites-available/default-ssl.conf
RUN echo "RemoteIPTrustedProxy $TRUSTED_PROXY_IP" >> /etc/apache2/apache2.conf
RUN echo "RemoteIPHeader X-Forwarded-For" >> /etc/apache2/apache2.conf
# Add custom log format called "remoteip" that uses remoteip module
......
......@@ -26,7 +26,7 @@ docker-php-ext-install -j "$(nproc)" \
zip \
;
# https://pecl.php.net/package/imagick
pecl install imagick-3.5.0;
pecl install imagick-3.7.0;
docker-php-ext-enable imagick;
rm -r /tmp/pear;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment