diff --git a/CloudronManifest.json b/CloudronManifest.json index 89694de..eefa871 100644 --- a/CloudronManifest.json +++ b/CloudronManifest.json @@ -18,7 +18,7 @@ } } }, - "manifestVersion": 1, + "manifestVersion": 2, "website": "http://www.freshrss.org", "contactEmail": "support@cloudron.io", "icon": "logo.png", diff --git a/start.sh b/start.sh index 48c42a3..dbd2766 100755 --- a/start.sh +++ b/start.sh @@ -9,9 +9,9 @@ if ! [ -f /app/data/.installed ]; then rsync -a /app/code/data-orig/ /app/data/ php cli/do-install.php \ --environment production --default_user admin \ - --db-type mysql --db-host "${MYSQL_HOST}" \ - --db-user "${MYSQL_USERNAME}" --db-password "${MYSQL_PASSWORD}" \ - --db-base "${MYSQL_DATABASE}" --db-prefix "" \ + --db-type mysql --db-host "${CLOUDRON_MYSQL_HOST}" \ + --db-user "${CLOUDRON_MYSQL_USERNAME}" --db-password "${CLOUDRON_MYSQL_PASSWORD}" \ + --db-base "${CLOUDRON_MYSQL_DATABASE}" --db-prefix "" \ --disable_update php cli/create-user.php --user admin --password changeme --language en touch /app/data/.installed @@ -32,10 +32,10 @@ for f in $(ls /app/code/extensions-orig); do done echo "==> Updating config file" -php cli/reconfigure.php --default_user admin --base_url "https://${APP_DOMAIN}" \ - --db-type mysql --db-host "${MYSQL_HOST}" \ - --db-user "${MYSQL_USERNAME}" --db-password "${MYSQL_PASSWORD}" \ - --db-base "${MYSQL_DATABASE}" --db-prefix "" \ +php cli/reconfigure.php --default_user admin --base_url "https://${CLOUDRON_APP_DOMAIN}" \ + --db-type mysql --db-host "${CLOUDRON_MYSQL_HOST}" \ + --db-user "${CLOUDRON_MYSQL_USERNAME}" --db-password "${CLOUDRON_MYSQL_PASSWORD}" \ + --db-base "${CLOUDRON_MYSQL_DATABASE}" --db-prefix "" \ --disable_update echo "==> Setting permissions"