diff --git a/ct/wger.sh b/ct/wger.sh index 5e1dacff7..845745ff5 100644 --- a/ct/wger.sh +++ b/ct/wger.sh @@ -53,7 +53,6 @@ function update_script() { set -a && source /opt/wger/.env && set +a export DJANGO_SETTINGS_MODULE=settings.main $STD uv pip install . - $STD uv pip install gunicorn psycopg2-binary $STD uv run python manage.py migrate $STD uv run python manage.py collectstatic --no-input msg_ok "Updated wger" diff --git a/install/wger-install.sh b/install/wger-install.sh index 3bc107471..ba944c672 100644 --- a/install/wger-install.sh +++ b/install/wger-install.sh @@ -13,8 +13,6 @@ setting_up_container network_check update_os -import_local_ip - msg_info "Installing Dependencies" $STD apt install -y \ build-essential \ @@ -23,12 +21,11 @@ $STD apt install -y \ libpq-dev msg_ok "Installed Dependencies" +import_local_ip NODE_VERSION="22" NODE_MODULE="sass" setup_nodejs setup_uv - PG_VERSION="16" setup_postgresql PG_DB_NAME="wger" PG_DB_USER="wger" setup_postgresql_db - fetch_and_deploy_gh_release "wger" "wger-project/wger" "tarball" "latest" "/opt/wger" msg_info "Setting up wger" @@ -40,10 +37,7 @@ $STD npm install $STD npm run build:css:sass $STD uv venv $STD uv pip install . --group docker -# $STD uv pip install psycopg2-binary - SECRET_KEY=$(openssl rand -base64 40) - cat </opt/wger/.env DJANGO_SETTINGS_MODULE=settings.main PYTHONPATH=/opt/wger @@ -79,9 +73,7 @@ CELERY_BACKEND=redis://127.0.0.1:6379/2 SITE_URL=http://${LOCAL_IP}:3000 SECRET_KEY=${SECRET_KEY} EOF - set -a && source /opt/wger/.env && set +a - $STD uv run wger bootstrap $STD uv run python manage.py collectstatic --no-input cat </etc/systemd/system/celery.service [Unit] Description=wger Celery Worker @@ -140,6 +130,8 @@ Restart=always WantedBy=multi-user.target EOF +mkdir -p /var/lib/wger/celery +chmod 700 /var/lib/wger/celery cat </etc/systemd/system/celery-beat.service [Unit] Description=wger Celery Beat @@ -156,8 +148,7 @@ Restart=always [Install] WantedBy=multi-user.target EOF - - cat <<'EOF' >/etc/nginx/sites-available/wger +cat <<'EOF' >/etc/nginx/sites-available/wger server { listen 3000; server_name _; @@ -182,13 +173,11 @@ server { } } EOF - msg_ok "Created Config and Services" $STD rm -f /etc/nginx/sites-enabled/default $STD ln -sf /etc/nginx/sites-available/wger /etc/nginx/sites-enabled/wger systemctl enable -q --now redis-server nginx wger celery celery-beat - systemctl restart nginx motd_ssh