Remove Matomo node_modules cleanup; tweak SolidTime
Stop removing /opt/matomo/node_modules in Matomo install/upgrade scripts (leave tests removal intact). For SolidTime, set SESSION_SECURE_COOKIE=false and APP_FORCE_HTTPS=false in the generated .env (and append them if missing) to ease non-HTTPS/local installs. Also add a warning message in the SolidTime UI JSON instructing admins to verify new accounts via: php /opt/solidtime/artisan admin:user:verify YOUR@EMAIL.
This commit is contained in:
@@ -28,7 +28,7 @@ function flatten_matomo_layout() {
|
||||
msg_ok "Migrated Legacy Layout"
|
||||
fi
|
||||
|
||||
rm -rf /opt/matomo/node_modules /opt/matomo/tests
|
||||
rm -rf /opt/matomo/tests
|
||||
}
|
||||
|
||||
function update_script() {
|
||||
|
||||
@@ -38,7 +38,7 @@ if [[ -d /opt/matomo/matomo ]]; then
|
||||
find /opt/matomo/matomo -mindepth 1 -maxdepth 1 -exec mv -t /opt/matomo {} +
|
||||
rm -rf /opt/matomo/matomo
|
||||
fi
|
||||
rm -rf /opt/matomo/node_modules /opt/matomo/tests
|
||||
rm -rf /opt/matomo/tests
|
||||
mkdir -p /opt/matomo/tmp
|
||||
chown -R www-data:www-data /opt/matomo
|
||||
chmod -R 755 /opt/matomo/tmp
|
||||
|
||||
@@ -41,6 +41,10 @@ sed -i "s|^DB_PASSWORD=.*|DB_PASSWORD=${PG_DB_PASS}|" .env
|
||||
sed -i "s|^FILESYSTEM_DISK=.*|FILESYSTEM_DISK=local|" .env
|
||||
sed -i "s|^PUBLIC_FILESYSTEM_DISK=.*|PUBLIC_FILESYSTEM_DISK=public|" .env
|
||||
sed -i "s|^MAIL_MAILER=.*|MAIL_MAILER=log|" .env
|
||||
sed -i "s|^SESSION_SECURE_COOKIE=.*|SESSION_SECURE_COOKIE=false|" .env
|
||||
grep -q "^SESSION_SECURE_COOKIE=" .env || echo "SESSION_SECURE_COOKIE=false" >>.env
|
||||
sed -i "s|^APP_FORCE_HTTPS=.*|APP_FORCE_HTTPS=false|" .env
|
||||
grep -q "^APP_FORCE_HTTPS=" .env || echo "APP_FORCE_HTTPS=false" >>.env
|
||||
$STD composer install --no-dev --optimize-autoloader
|
||||
php artisan self-host:generate-keys >/tmp/solidtime.keys 2>/dev/null
|
||||
while IFS= read -r line; do
|
||||
|
||||
@@ -35,6 +35,10 @@
|
||||
{
|
||||
"text": "Create your first account by registering via the web interface.",
|
||||
"type": "info"
|
||||
},
|
||||
{
|
||||
"text": "After registering, verify your account via the container shell: php /opt/solidtime/artisan admin:user:verify YOUR@EMAIL",
|
||||
"type": "warning"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user