diff --git a/.gitignore b/.gitignore index 4455c0a..e379f5c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ docker-compose.yml docker flarum.env +test.sh diff --git a/README.md b/README.md index f6f1b58..19592a5 100644 --- a/README.md +++ b/README.md @@ -202,6 +202,16 @@ docker exec -ti flarum extension list File to change the vhost flarum `/etc/nginx/flarum/custom-vhost-flarum.conf` To use file custom-vhost-flarum.conf add volume `/etc/nginx/flarum` +Create file in `/mnt/docker/flarum/nginx/custom-vhost-flarum.conf` + +```nginx +# Example of custom vhost flarum for nginx +# fix nginx issue for fof/sitemap (https://github.com/FriendsOfFlarum/sitemap) + +location = /sitemap.xml { + try_files $uri $uri/ /index.php?$query_string; +} +``` ### Custom composer repositories diff --git a/rootfs/etc/nginx/nginx.conf b/rootfs/etc/nginx/nginx.conf index 448c792..654b4c6 100644 --- a/rootfs/etc/nginx/nginx.conf +++ b/rootfs/etc/nginx/nginx.conf @@ -57,6 +57,8 @@ http { fastcgi_param REMOTE_ADDR $http_x_real_ip; } - include /etc/nginx/flarum/custom-vhost-flarum.conf; + if (-f /etc/nginx/flarum/custom-vhost-flarum.conf) { + include /etc/nginx/flarum/custom-vhost-flarum.conf; + } } } diff --git a/rootfs/usr/local/bin/startup b/rootfs/usr/local/bin/startup index ede0aae..7cffaab 100644 --- a/rootfs/usr/local/bin/startup +++ b/rootfs/usr/local/bin/startup @@ -65,15 +65,6 @@ if [ -f '/flarum/app/extensions/composer.repositories.txt' ]; then done < /flarum/app/extensions/composer.repositories.txt fi -# Custom vhost flarum nginx -if [ ! -e '/etc/nginx/flarum/custom-vhost-flarum.conf' ]; then - echo '# Example: -# fix for flagrow/sitemap (https://github.com/flagrow/sitemap) -# location = /sitemap.xml { -# try_files $uri $uri/ /index.php?$query_string; -# }' > /etc/nginx/flarum/custom-vhost-flarum.conf -fi - # if installation was performed before if [ -e '/flarum/app/public/assets/rev-manifest.json' ] || [ -e '/flarum/app/public/assets/._flarum-installed.lock' ] ; then echo "[INFO] Flarum already installed, init app..." @@ -127,8 +118,9 @@ else -e "s||${FLARUM_TITLE}|g" /flarum/app/config.yml # Install flarum - su-exec "${UID}:${GID}" php /flarum/app/flarum install --file=/flarum/app/config.yml && - touch /flarum/app/public/assets/._flarum-installed.lock + su-exec "${UID}:${GID}" php /flarum/app/flarum install --file=/flarum/app/config.yml \ + && touch /flarum/app/public/assets/._flarum-installed.lock + echo "[INFO] End of flarum installation" fi