diff --git a/README.md b/README.md index 0cbb667..475350c 100644 --- a/README.md +++ b/README.md @@ -240,6 +240,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **13.03.21:** - Make searchproviders.yaml user configurable. * **11.03.21:** - Rebase to alpine 3.14. * **10.02.21:** - Revert to alpine 3.12 as php 7.4 broke laravel. * **10.02.21:** - Rebasing to alpine 3.13. diff --git a/readme-vars.yml b/readme-vars.yml index e578ca7..c345964 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -49,6 +49,7 @@ app_setup_block: | # changelog changelogs: + - { date: "13.03.21:", desc: "Make searchproviders.yaml user configurable." } - { date: "11.03.21:", desc: "Rebase to alpine 3.14." } - { date: "10.02.21:", desc: "Revert to alpine 3.12 as php 7.4 broke laravel." } - { date: "10.02.21:", desc: "Rebasing to alpine 3.13." } diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 6a104ef..f8c199c 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -15,6 +15,7 @@ mkdir -p \ echo -e '\n# Heimdall user authorization\nfastcgi_param PHP_AUTH_USER $remote_user;\nfastcgi_param PHP_AUTH_PW $http_authorization;' >> \ /etc/nginx/fastcgi_params && \ rm -rf /heimdall && \ + cp /var/www/localhost/heimdall/app/searchproviders.yaml /var/www/localhost/heimdall/app/searchproviders.yaml.orig && \ chown -R abc:abc /var/www/localhost/heimdall # create symlinks @@ -43,6 +44,11 @@ done cp /var/www/localhost/heimdall/.env.example /config/www/.env && \ echo "Creating app key. This may take a while on slower systems" && \ php /var/www/localhost/heimdall/artisan key:generate +# copy searchproviders if not exists and symlink +[[ ! -f /config/www/searchproviders.yaml ]] && \ + cp /var/www/localhost/heimdall/app/searchproviders.yaml.orig /config/www/searchproviders.yaml +rm -rf /var/www/localhost/heimdall/app/searchproviders.yaml +ln -s /config/www/searchproviders.yaml /var/www/localhost/heimdall/app/searchproviders.yaml # set queue driver to database sed -i 's/QUEUE_DRIVER=sync/QUEUE_DRIVER=database/' /config/www/.env