diff --git a/ct/snapotter.sh b/ct/snapotter.sh index 8ccd4d21..c862a22f 100644 --- a/ct/snapotter.sh +++ b/ct/snapotter.sh @@ -35,10 +35,6 @@ function update_script() { systemctl stop snapotter msg_ok "Stopped Service" - msg_info "Backing up Data" - cp -r /opt/snapotter/data /opt/snapotter_data_backup - msg_ok "Backed up Data" - CLEAN_INSTALL=1 fetch_and_deploy_gh_release "snapotter" "snapotter-hq/SnapOtter" "tarball" cd /opt/snapotter @@ -46,11 +42,6 @@ function update_script() { $STD pnpm install --frozen-lockfile $STD pnpm --filter @snapotter/web build - msg_info "Restoring Data" - cp -r /opt/snapotter_data_backup/. /opt/snapotter/data - rm -rf /opt/snapotter_data_backup - msg_ok "Restored Data" - msg_info "Starting Service" systemctl start snapotter msg_ok "Started Service" diff --git a/install/snapotter-install.sh b/install/snapotter-install.sh index 3501e4f2..c59bd6db 100644 --- a/install/snapotter-install.sh +++ b/install/snapotter-install.sh @@ -45,14 +45,14 @@ msg_ok "Enabled pnpm" fetch_and_deploy_gh_release "snapotter" "snapotter-hq/SnapOtter" "tarball" msg_info "Setting up Python Environment" -mkdir -p /opt/snapotter/data/ai/models/rembg -$STD uv venv --seed /opt/snapotter/data/ai/venv +mkdir -p /opt/snapotter_data/ai/models/rembg +$STD uv venv --seed /opt/snapotter_data/ai/venv BASE_PKGS=$(jq -r '.basePackages | join(" ")' /opt/snapotter/docker/feature-manifest.json) -$STD uv pip install --python /opt/snapotter/data/ai/venv/bin/python ${BASE_PKGS} +$STD uv pip install --python /opt/snapotter_data/ai/venv/bin/python ${BASE_PKGS} msg_ok "Set up Python Environment" msg_info "Building SnapOtter" -mkdir -p /opt/snapotter/data/files +mkdir -p /opt/snapotter_data/files cd /opt/snapotter $STD npm pkg delete scripts.prepare $STD pnpm install --frozen-lockfile @@ -60,16 +60,16 @@ $STD pnpm --filter @snapotter/web build msg_ok "Built SnapOtter" msg_info "Configuring SnapOtter" -cat </opt/snapotter/.env +cat </opt/snapotter_data/.env PORT=1349 NODE_ENV=production -DB_PATH=/opt/snapotter/data/snapotter.db +DB_PATH=/opt/snapotter_data/snapotter.db WORKSPACE_PATH=/tmp/snapotter-workspace -FILES_STORAGE_PATH=/opt/snapotter/data/files -PYTHON_VENV_PATH=/opt/snapotter/data/ai/venv -MODELS_PATH=/opt/snapotter/data/ai/models -DATA_DIR=/opt/snapotter/data -U2NET_HOME=/opt/snapotter/data/ai/models/rembg +FILES_STORAGE_PATH=/opt/snapotter_data/files +PYTHON_VENV_PATH=/opt/snapotter_data/ai/venv +MODELS_PATH=/opt/snapotter_data/ai/models +DATA_DIR=/opt/snapotter_data +U2NET_HOME=/opt/snapotter_data/ai/models/rembg AUTH_ENABLED=true DEFAULT_USERNAME=admin DEFAULT_PASSWORD=admin @@ -92,7 +92,7 @@ After=network.target Type=simple User=root WorkingDirectory=/opt/snapotter -EnvironmentFile=/opt/snapotter/.env +EnvironmentFile=/opt/snapotter_data/.env ExecStart=${PNPM_BIN} --filter @snapotter/api run start Restart=on-failure RestartSec=5 diff --git a/json/snapotter.json b/json/snapotter.json index 197d73a9..f26a8955 100644 --- a/json/snapotter.json +++ b/json/snapotter.json @@ -17,7 +17,7 @@ { "type": "default", "script": "ct/snapotter.sh", - "config_path": "/opt/snapotter/.env", + "config_path": "/opt/snapotter_data/.env", "resources": { "cpu": 2, "ram": 2048,