Merge branch 'FixTravisAgain' into develop

NextDom · Mar 16, 2020 · ea28cbd · ea28cbd
2 parents c8f5965 + 507fe98
commit ea28cbd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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