diff --git a/ct/matomo.sh b/ct/matomo.sh index 6e990683..9f931ce2 100644 --- a/ct/matomo.sh +++ b/ct/matomo.sh @@ -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() { diff --git a/install/matomo-install.sh b/install/matomo-install.sh index 2f3f20d1..3a6f9b00 100644 --- a/install/matomo-install.sh +++ b/install/matomo-install.sh @@ -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 diff --git a/install/solidtime-install.sh b/install/solidtime-install.sh index 6426cbee..72cad272 100644 --- a/install/solidtime-install.sh +++ b/install/solidtime-install.sh @@ -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 diff --git a/json/solidtime.json b/json/solidtime.json index 0dc5564e..fa09ee82 100644 --- a/json/solidtime.json +++ b/json/solidtime.json @@ -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" } ] -} +} \ No newline at end of file