diff --git a/CloudronManifest.json b/CloudronManifest.json index 9186dfd..767897c 100644 --- a/CloudronManifest.json +++ b/CloudronManifest.json @@ -15,7 +15,7 @@ "ldap": {}, "sendmail": { "supportsDisplayName": false }, "localstorage": {}, - "postgresql": {} + "mysql": {} }, "optionalSso": true, "manifestVersion": 2, diff --git a/start.sh b/start.sh index 37d44ea..f5695b9 100755 --- a/start.sh +++ b/start.sh @@ -4,22 +4,26 @@ set -eu -o pipefail mkdir -p /run/traccar/logs /app/data/media +echo -e "[client]\npassword=${CLOUDRON_MYSQL_PASSWORD}" > /run/traccar/mysql-extra +readonly mysql="mysql --defaults-file=/run/traccar/mysql-extra --user=${CLOUDRON_MYSQL_USERNAME} --host=${CLOUDRON_MYSQL_HOST} -P ${CLOUDRON_MYSQL_PORT} ${CLOUDRON_MYSQL_DATABASE}" + disable_registration() { + sleep 10 echo "==> disabling registration" - PGPASSWORD=${CLOUDRON_POSTGRESQL_PASSWORD} psql -h ${CLOUDRON_POSTGRESQL_HOST} -p ${CLOUDRON_POSTGRESQL_PORT} -U ${CLOUDRON_POSTGRESQL_USERNAME} -d ${CLOUDRON_POSTGRESQL_DATABASE} -c "UPDATE tc_servers SET registration=false WHERE id=1" + $mysql -e "UPDATE tc_servers SET registration=0 WHERE id=1" } echo "=> Ensure traccar.xml config" if [[ ! -f /app/data/traccar.xml ]]; then cp /app/pkg/traccar.xml.template /app/data/traccar.xml - (sleep 10000; disable_registration) & + disable_registration & fi -# database +# database (https://www.traccar.org/mysql/) xmlstarlet ed --inplace \ - --update '//properties/entry[@key="database.url"]' -v "jdbc:postgresql://${CLOUDRON_POSTGRESQL_HOST}:${CLOUDRON_POSTGRESQL_PORT}/${CLOUDRON_POSTGRESQL_DATABASE}" \ - --update '//properties/entry[@key="database.user"]' -v "${CLOUDRON_POSTGRESQL_USERNAME}" \ - --update '//properties/entry[@key="database.password"]' -v "${CLOUDRON_POSTGRESQL_PASSWORD}" \ + --update '//properties/entry[@key="database.url"]' -v "jdbc:mysql://${CLOUDRON_MYSQL_HOST}:${CLOUDRON_MYSQL_PORT}/${CLOUDRON_MYSQL_DATABASE}?serverTimezone=UTC&allowPublicKeyRetrieval=true&useSSL=false&allowMultiQueries=true&autoReconnect=true&useUnicode=yes&characterEncoding=UTF-8&sessionVariables=sql_mode=''" \ + --update '//properties/entry[@key="database.user"]' -v "${CLOUDRON_MYSQL_USERNAME}" \ + --update '//properties/entry[@key="database.password"]' -v "${CLOUDRON_MYSQL_PASSWORD}" \ /app/data/traccar.xml # origin diff --git a/traccar.xml.template b/traccar.xml.template index 036ad08..38d32ac 100644 --- a/traccar.xml.template +++ b/traccar.xml.template @@ -18,10 +18,10 @@ --> - org.postgresql.Driver - jdbc:postgresql://##CLOUDRON_POSTGRESQL_HOST##:##CLOUDRON_POSTGRESQL_PORT##/##CLOUDRON_POSTGRESQL_DATABASE## - ##CLOUDRON_POSTGRESQL_USERNAME## - ##CLOUDRON_POSTGRESQL_PASSWORD## + com.mysql.cj.jdbc.Driver + jdbc:mysql://##CLOUDRON_MYSQL_HOST##:##CLOUDRON_MYSQL_PORT##/##CLOUDRON_MYSQL_DATABASE## + ##CLOUDRON_MYSQL_USERNAME## + ##CLOUDRON_MYSQL_PASSWORD## ##CLOUDRON_APP_ORIGIN##