From 85afafa5855fbdd4ffd76da70171ebb7c8e4bc20 Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 4 Jan 2019 15:36:03 +0000 Subject: [PATCH 1/2] generate app key on new install --- README.md | 1 + readme-vars.yml | 1 + root/etc/cont-init.d/50-config | 13 +++++++------ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index b0db8ac..44f0229 100644 --- a/README.md +++ b/README.md @@ -138,6 +138,7 @@ This image now supports password protection through htpasswd. Run the following ## Versions +* **04.01.18:** - Generate random app key in .env for new installs. * **20.11.18:** - Upgrade baseimage packages during build. * **04.11.18:** - Add php7-zip. * **31.10.18:** - Add queue service. diff --git a/readme-vars.yml b/readme-vars.yml index a8e0381..441abe2 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -47,6 +47,7 @@ app_setup_block: | # changelog changelogs: + - { date: "04.01.18:", desc: "Generate random app key in .env for new installs." } - { date: "20.11.18:", desc: "Upgrade baseimage packages during build." } - { date: "04.11.18:", desc: "Add php7-zip." } - { date: "31.10.18:", desc: "Add queue service." } diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config index 8624b9c..1b012eb 100644 --- a/root/etc/cont-init.d/50-config +++ b/root/etc/cont-init.d/50-config @@ -4,12 +4,6 @@ mkdir -p \ /config/www/{backgrounds,icons,avatars,SupportedApps} -# copy .env if not exists -[[ ! -f /config/www/.env ]] && \ - cp /var/www/localhost/heimdall/.env /config/www/.env -# set queue driver to database -sed -i 's/QUEUE_DRIVER=sync/QUEUE_DRIVER=database/' /config/www/.env - # create symlinks symlinks=( \ @@ -26,6 +20,13 @@ do [[ ! -L "$i" ]] && ln -s /config/www/"$(basename "$i")" "$i" done +# copy .env if not exists +[[ ! -f /config/www/.env ]] && \ + cp /var/www/localhost/heimdall/.env.example /config/www/.env && \ + php /var/www/localhost/heimdall/artisan key:generate +# set queue driver to database +sed -i 's/QUEUE_DRIVER=sync/QUEUE_DRIVER=database/' /config/www/.env + # permissions chown -R abc:abc \ /config \ From 273c4f86e9864027b364eb6797addc545588cff8 Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 16 Jan 2019 12:31:40 -0500 Subject: [PATCH 2/2] fix changelog date --- README.md | 2 +- readme-vars.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 44f0229..515c9e9 100644 --- a/README.md +++ b/README.md @@ -138,7 +138,7 @@ This image now supports password protection through htpasswd. Run the following ## Versions -* **04.01.18:** - Generate random app key in .env for new installs. +* **16.01.18:** - Generate random app key in .env for new installs. * **20.11.18:** - Upgrade baseimage packages during build. * **04.11.18:** - Add php7-zip. * **31.10.18:** - Add queue service. diff --git a/readme-vars.yml b/readme-vars.yml index 441abe2..854a5e2 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -47,7 +47,7 @@ app_setup_block: | # changelog changelogs: - - { date: "04.01.18:", desc: "Generate random app key in .env for new installs." } + - { date: "16.01.18:", desc: "Generate random app key in .env for new installs." } - { date: "20.11.18:", desc: "Upgrade baseimage packages during build." } - { date: "04.11.18:", desc: "Add php7-zip." } - { date: "31.10.18:", desc: "Add queue service." }