diff --git a/ct/solidtime.sh b/ct/solidtime.sh index 2296635c..57d70268 100644 --- a/ct/solidtime.sh +++ b/ct/solidtime.sh @@ -7,8 +7,8 @@ source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxV APP="SolidTime" var_tags="${var_tags:-time-tracking;productivity;business}" -var_cpu="${var_cpu:-2}" -var_ram="${var_ram:-2048}" +var_cpu="${var_cpu:-4}" +var_ram="${var_ram:-4096}" var_disk="${var_disk:-8}" var_os="${var_os:-debian}" var_version="${var_version:-13}" diff --git a/install/matomo-install.sh b/install/matomo-install.sh index 45f23ae6..a1365f30 100644 --- a/install/matomo-install.sh +++ b/install/matomo-install.sh @@ -18,6 +18,7 @@ $STD apt install -y caddy msg_ok "Installed Dependencies" PHP_VERSION="8.3" PHP_FPM="YES" PHP_MODULES="pdo_mysql,gd,mbstring,xml,curl,intl,zip,ldap" setup_php +setup_mariadb MARIADB_DB_NAME="matomo" MARIADB_DB_USER="matomo" setup_mariadb_db fetch_and_deploy_gh_release "matomo" "matomo-org/matomo" "prebuild" "latest" "/opt/matomo" "matomo-*.zip" diff --git a/install/solidtime-install.sh b/install/solidtime-install.sh index 74b64fd8..6426cbee 100644 --- a/install/solidtime-install.sh +++ b/install/solidtime-install.sh @@ -31,21 +31,35 @@ cp .env.example .env sed -i "s|^APP_ENV=.*|APP_ENV=production|" .env sed -i "s|^APP_DEBUG=.*|APP_DEBUG=false|" .env sed -i "s|^APP_URL=.*|APP_URL=http://${LOCAL_IP}|" .env +sed -i "s|^APP_ENABLE_REGISTRATION=.*|APP_ENABLE_REGISTRATION=true|" .env sed -i "s|^DB_CONNECTION=.*|DB_CONNECTION=pgsql|" .env sed -i "s|^DB_HOST=.*|DB_HOST=127.0.0.1|" .env sed -i "s|^DB_PORT=.*|DB_PORT=5432|" .env sed -i "s|^DB_DATABASE=.*|DB_DATABASE=${PG_DB_NAME}|" .env sed -i "s|^DB_USERNAME=.*|DB_USERNAME=${PG_DB_USER}|" .env 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 $STD composer install --no-dev --optimize-autoloader -$STD php artisan key:generate +php artisan self-host:generate-keys >/tmp/solidtime.keys 2>/dev/null +while IFS= read -r line; do + KEY="${line%%=*}" + [[ -z "$KEY" || "${KEY:0:1}" == "#" ]] && continue + sed -i "/^${KEY}=/d" .env + echo "$line" >>.env +done