diff --git a/ct/scanopy.sh b/ct/scanopy.sh index 86192819a..a44433cb3 100644 --- a/ct/scanopy.sh +++ b/ct/scanopy.sh @@ -67,15 +67,11 @@ function update_script() { mv ./target/release/server /usr/bin/scanopy-server msg_ok "Built scanopy-server" - msg_info "Building scanopy-daemon" - $STD cargo build --release --bin daemon - cp ./target/release/daemon /usr/bin/scanopy-daemon - msg_ok "Built scanopy-daemon" - msg_info "Starting services" systemctl start scanopy-server [[ -f /etc/systemd/system/scanopy-daemon.service ]] && systemctl start scanopy-daemon msg_ok "Updated successfully!" + msg_warn "Update your integrated daemon via the UI" fi exit } diff --git a/frontend/public/json/scanopy.json b/frontend/public/json/scanopy.json index ef117782e..0798067f3 100644 --- a/frontend/public/json/scanopy.json +++ b/frontend/public/json/scanopy.json @@ -37,7 +37,7 @@ "type": "info" }, { - "text": "The integrated daemon config is located at `/root/.config/daemon/config.json`", + "text": "The integrated daemon config is located at `/root/.config/daemon/`", "type": "info" } ] diff --git a/install/scanopy-install.sh b/install/scanopy-install.sh index 1453e097b..e832bba9b 100644 --- a/install/scanopy-install.sh +++ b/install/scanopy-install.sh @@ -41,39 +41,34 @@ $STD cargo build --release --bin server mv ./target/release/server /usr/bin/scanopy-server msg_ok "Built scanopy-server" -msg_info "Building scanopy-daemon" -$STD cargo build --release --bin daemon -cp ./target/release/daemon /usr/bin/scanopy-daemon -msg_ok "Built scanopy-daemon" - msg_info "Configuring server for first-run" cat </opt/scanopy/.env ### - SERVER -scanopy_DATABASE_URL=postgresql://$PG_DB_USER:$PG_DB_PASS@localhost:5432/$PG_DB_NAME -scanopy_WEB_EXTERNAL_PATH="/opt/scanopy/ui/build" -scanopy_PUBLIC_URL=http://${LOCAL_IP}:60072 -scanopy_SERVER_PORT=60072 -scanopy_LOG_LEVEL=info -scanopy_INTEGRATED_DAEMON_URL=http://127.0.0.1:60073 +SCANOPY_DATABASE_URL=postgresql://$PG_DB_USER:$PG_DB_PASS@localhost:5432/$PG_DB_NAME +SCANOPY_WEB_EXTERNAL_PATH="/opt/scanopy/ui/build" +SCANOPY_PUBLIC_URL=http://${LOCAL_IP}:60072 +SCANOPY_SERVER_PORT=60072 +SCANOPY_LOG_LEVEL=info +SCANOPY_INTEGRATED_DAEMON_URL=http://127.0.0.1:60073 ## - uncomment to disable signups -# scanopy_DISABLE_REGISTRATION=true +# SCANOPY_DISABLE_REGISTRATION=true ## - uncomment when using TLS -# scanopy_USE_SECURE_SESSION_COOKIES=true +# SCANOPY_USE_SECURE_SESSION_COOKIES=true ## - see https://github.com/imbolc/axum-client-ip?tab=readme-ov-file#configurable-vs-specific-extractors ## - before uncommenting the below -# scanopy_CLIENT_IP_SOURCE= +# SCANOPY_CLIENT_IP_SOURCE= ### - SMTP (password reset and notifications - optional) -# scanopy_SMTP_RELAY=smtp.gmail.com:587 -# scanopy_SMTP_USERNAME=your-email@gmail.com -# scanopy_SMTP_PASSWORD=your-app-password -# scanopy_SMTP_EMAIL=scanopy@yourdomain.tld +# SCANOPY_SMTP_RELAY=smtp.gmail.com:587 +# SCANOPY_SMTP_USERNAME=your-email@gmail.com +# SCANOPY_SMTP_PASSWORD=your-app-password +# SCANOPY_SMTP_EMAIL=scanopy@yourdomain.tld ### - INTEGRATED DAEMON -scanopy_SERVER_URL=http://127.0.0.1:60072 -scanopy_BIND_ADDRESS=0.0.0.0 -scanopy_NAME="scanopy-daemon" -scanopy_HEARTBEAT_INTERVAL=30 +SCANOPY_SERVER_URL=http://127.0.0.1:60072 +SCANOPY_BIND_ADDRESS=0.0.0.0 +SCANOPY_NAME="scanopy-daemon" +SCANOPY_HEARTBEAT_INTERVAL=30 ### - see https://github.com/scanopy/scanopy/blob/main/docs/CONFIGURATION.md for more options EOF