From 62aded7488fadd0b1fbd7dc561c60067253484f5 Mon Sep 17 00:00:00 2001 From: "m.kokhanskyi" Date: Tue, 21 Jan 2020 15:25:15 +0200 Subject: [PATCH 1/2] 80963 --- entrypoint.d/010-load.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/entrypoint.d/010-load.sh b/entrypoint.d/010-load.sh index b54fd7d..e56970f 100755 --- a/entrypoint.d/010-load.sh +++ b/entrypoint.d/010-load.sh @@ -85,15 +85,14 @@ if DbReachable; then cd /var/www/html && sudo -u www-data composer create-project treolabs/skeleton ${DOMAIN} --no-dev --prefer-dist && cd ${DOMAIN} && sudo -u www-data composer require --no-update treolabs/pim:* && sudo -u www-data composer update --no-dev sed -ri 's/DocumentRoot \/var\/www\/html$/DocumentRoot \/var\/www\/html\/'${DOMAIN}'/g' /etc/apache2/sites-available/000-default.conf - cd /var/www/html/${DOMAIN} && sudo -u www-data chmod +x ./bin/cron.sh NOTICE 'Reload Apache' - service apache2 reload + service apache2 reload crontab -l -u www-data | { cat - printf "\n* * * * * /var/www/html/${DOMAIN}/bin/cron.sh process-treocore php\n" + printf "\n* * * * * /usr/bin/php$PHP_VER /var/www/html/${DOMAIN}/index.php cron\n" } | crontab -u www-data - INFO "Current crontab is $(crontab -l -u www-data)" From 6aaa66e66fc6f104c792b70c98b231b36257da13 Mon Sep 17 00:00:00 2001 From: "m.kokhanskyi" Date: Thu, 6 Feb 2020 10:45:59 +0200 Subject: [PATCH 2/2] 80963 --- entrypoint.d/010-load.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/entrypoint.d/010-load.sh b/entrypoint.d/010-load.sh index e56970f..2c0149f 100755 --- a/entrypoint.d/010-load.sh +++ b/entrypoint.d/010-load.sh @@ -102,10 +102,6 @@ if DbReachable; then sed -ri "s/'user'\s*=>\s*'\s*'/'user' => 'root'/g" /var/www/html/${DOMAIN}/data/config.php sed -ri "s/'password'\s*=>\s*'\s*'/'password' => '${MYSQL_ROOT_PASSWORD}'/g" /var/www/html/${DOMAIN}/data/config.php - echo '###########################' - NOTICE "Open in the browser http://localhost:${WEB_PORT} for continue installation" - echo '###########################' - fi fi @@ -117,6 +113,10 @@ if DbReachable; then INFO "Update alies for sendmail" newaliases + + echo '###########################' + NOTICE "Open in the browser http://localhost:${WEB_PORT} for continue installation" + echo '###########################' else FATAL 'Mysql host database_server is not reachable'