From 507fe98a4d9a968d58c473202f4e9ddff104f9fd Mon Sep 17 00:00:00 2001 From: Sylvaner Date: Mon, 2 Mar 2020 23:37:48 +0100 Subject: [PATCH] Fix Travis --- .travis.yml | 1 + install/postinst | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9b651528e..59e35c5bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,7 @@ before_install: - sudo pip3 install --ignore-installed pylint - composer require --dev php-coveralls/php-coveralls - while true; do DOCKER_LOGS=$(docker logs --tail 10 nextdom-test 2>&1); if [[ "$DOCKER_LOGS" =~ .*NEXTDOM.TEST.READY.* ]]; then break; fi; sleep 2; done + - docker logs nextdom-test - docker exec -it nextdom-test service mysql stop - docker commit nextdom-test nextdom-test-snap - docker kill nextdom-test & diff --git a/install/postinst b/install/postinst index 73e692040..f51691ae3 100755 --- a/install/postinst +++ b/install/postinst @@ -168,8 +168,8 @@ step_nextdom_file_permissions() { step_nextdom_mysql_parameters() { if [ 1 -eq "0${isdev}" ] ; then # Development version - [[ -z "${MYSQL_NEXTDOM_DB}" ]] && MYSQL_NEXTDOM_DB="nextdomdev" - [[ -z "${MYSQL_NEXTDOM_USER}" ]] && MYSQL_NEXTDOM_USER="nextdomdev" + [[ -z "${MYSQL_NEXTDOM_DB}" ]] && MYSQL_NEXTDOM_DB="nextdom" + [[ -z "${MYSQL_NEXTDOM_USER}" ]] && MYSQL_NEXTDOM_USER="nextdom" else # Debian package configuration... # nextdom-mysql preconfiguration