diff --git a/setup/container.sh b/setup/container.sh index 2091b8f97..2687a514c 100755 --- a/setup/container.sh +++ b/setup/container.sh @@ -28,7 +28,6 @@ cp "${container_files}/sudoers" /etc/sudoers.d/yellowtent ########## collectd rm -rf /etc/collectd ln -sfF "${DATA_DIR}/collectd" /etc/collectd -service collectd restart ########## nginx # link nginx config to system config @@ -37,7 +36,6 @@ ln -s "${DATA_DIR}/nginx" /etc/nginx ########## mysql cp "${container_files}/mysql.cnf" /etc/mysql/mysql.cnf -service mysql restart ########## Enable services update-rc.d -f collectd defaults diff --git a/setup/start.sh b/setup/start.sh index 90e5b7485..909cba975 100755 --- a/setup/start.sh +++ b/setup/start.sh @@ -56,6 +56,9 @@ echo "{ \"version\": \"${arg_version}\", \"boxVersionsUrl\": \"${arg_box_version echo "Cleaning up snapshots" find "${DATA_DIR}/snapshots" -mindepth 1 -maxdepth 1 | xargs --no-run-if-empty btrfs subvolume delete +# restart mysql to make sure it has latest config +service mysql restart + readonly mysql_root_password="password" mysqladmin -u root -ppassword password password # reset default root password mysql -u root -p${mysql_root_password} -e 'CREATE DATABASE IF NOT EXISTS box'