Compare commits
28 commits
3ea4c562e1
...
66f54677bf
| Author | SHA1 | Date | |
|---|---|---|---|
| 66f54677bf | |||
| 63c2e17818 | |||
| f695cad94f | |||
| e7b5718469 | |||
| a01c229d71 | |||
| be19d9e06b | |||
| 60f2a87955 | |||
| 7d2b4fbab2 | |||
| 8619b1b09d | |||
| 647f3f1c6c | |||
| 41adbc2cca | |||
| c865017561 | |||
| 5ffa0d71af | |||
| 0057ca3612 | |||
| 504bb66a82 | |||
| 1e6289b223 | |||
| 8c3f51a49d | |||
| cf0d94873d | |||
| 8eef47058d | |||
| dcaf90d39f | |||
| a8e107059a | |||
| ea4cb78646 | |||
| eda45af678 | |||
| fc994375b1 | |||
| 3fe4f7ece7 | |||
| 4202f0dcf9 | |||
| fad4e1457b | |||
| b798123f14 |
4 changed files with 2 additions and 87 deletions
|
|
@ -1 +1 @@
|
||||||
Subproject commit dec3a086abd2df28452f44f8f8986a3e3ae27005
|
Subproject commit 8257d4996739379a6d608230d18047569559864b
|
||||||
2
botui
2
botui
|
|
@ -1 +1 @@
|
||||||
Subproject commit 4f654dd95daeb8e21c7977f6f4762fdac392b2d3
|
Subproject commit 9b417bf4f23f540b5c8cace81e50c37729844e06
|
||||||
59
restart.sh
59
restart.sh
|
|
@ -1,59 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
set -e
|
|
||||||
|
|
||||||
echo "🛑 Stopping existing processes..."
|
|
||||||
pkill -f "botserver --noconsole" || true
|
|
||||||
pkill -f botui || true
|
|
||||||
pkill -f rustc || true
|
|
||||||
# Note: PostgreSQL, Vault, and Valkey are managed by botserver bootstrap, don't kill them
|
|
||||||
|
|
||||||
echo "🧹 Cleaning logs..."
|
|
||||||
rm -f botserver.log botui.log
|
|
||||||
|
|
||||||
echo "🔨 Building botserver..."
|
|
||||||
cargo build -p botserver
|
|
||||||
|
|
||||||
echo "🔨 Building botui..."
|
|
||||||
cargo build -p botui
|
|
||||||
|
|
||||||
echo "🗄️ Starting PostgreSQL..."
|
|
||||||
./botserver-stack/bin/tables/bin/postgres -D botserver-stack/data/tables/pgdata -c config_file=botserver-stack/conf/postgresql.conf > botserver-stack/logs/tables/postgres.log 2>&1 &
|
|
||||||
echo " PostgreSQL PID: $!"
|
|
||||||
sleep 2
|
|
||||||
|
|
||||||
echo "🔑 Starting Valkey (cache)..."
|
|
||||||
./botserver-stack/bin/cache/valkey-server --daemonize no --dir botserver-stack/data/cache > /dev/null 2>&1 &
|
|
||||||
echo " Valkey started"
|
|
||||||
sleep 2
|
|
||||||
|
|
||||||
echo "🚀 Starting botserver..."
|
|
||||||
export VAULT_ADDR="https://localhost:8200"
|
|
||||||
export VAULT_TOKEN="hvs.JjKHlEzycO2jvKdhhlRAoODu"
|
|
||||||
export VAULT_CACERT="./botserver-stack/conf/system/certificates/ca/ca.crt"
|
|
||||||
export VAULT_CACHE_TTL="300"
|
|
||||||
RUST_LOG=info ./target/debug/botserver --noconsole > botserver.log 2>&1 &
|
|
||||||
BOTSERVER_PID=$!
|
|
||||||
|
|
||||||
echo "⏳ Waiting for Vault to start (unsealing in background)..."
|
|
||||||
(
|
|
||||||
sleep 8
|
|
||||||
echo "🔓 Unsealing Vault..."
|
|
||||||
UNSEAL_KEY=$(python3 -c "import json; print(json.load(open('botserver-stack/conf/vault/init.json'))['unseal_keys_b64'][0])" 2>/dev/null)
|
|
||||||
if [ -n "$UNSEAL_KEY" ]; then
|
|
||||||
curl -s --cacert botserver-stack/conf/system/certificates/ca/ca.crt \
|
|
||||||
-X POST \
|
|
||||||
-H "X-Vault-Token: hvs.JjKHlEzycO2jvKdhhlRAoODu" \
|
|
||||||
-d "{\"key\": \"$UNSEAL_KEY\"}" \
|
|
||||||
https://localhost:8200/v1/sys/unseal 2>/dev/null && echo "✅ Vault unsealed" || echo "⚠️ Unseal failed"
|
|
||||||
else
|
|
||||||
echo "⚠️ Could not extract unseal key"
|
|
||||||
fi
|
|
||||||
) &
|
|
||||||
|
|
||||||
echo "🚀 Starting botui..."
|
|
||||||
BOTSERVER_URL="https://localhost:8088" ./target/debug/botui > botui.log 2>&1 &
|
|
||||||
BOTUI_PID=$!
|
|
||||||
|
|
||||||
echo "✅ Started botserver (PID: $BOTSERVER_PID) and botui (PID: $BOTUI_PID)"
|
|
||||||
echo "📊 Monitor with: tail -f botserver.log botui.log"
|
|
||||||
echo "🌐 Access at: http://localhost:3000"
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
set -e
|
|
||||||
|
|
||||||
echo "🔓 Unsealing Vault..."
|
|
||||||
UNSEAL_KEY="$(cat botserver-stack/conf/vault/init.json | grep -o '"unseal_keys_b64":\["[^"]*"' | cut -d'"' -f4)"
|
|
||||||
|
|
||||||
# Wait for Vault to start
|
|
||||||
for i in {1..30}; do
|
|
||||||
if curl -sfk --cacert botserver-stack/conf/system/certificates/ca/ca.crt \
|
|
||||||
https://localhost:8200/v1/sys/health > /dev/null 2>&1; then
|
|
||||||
echo "✅ Vault is running"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
echo "⏳ Waiting for Vault... ($i/30)"
|
|
||||||
sleep 1
|
|
||||||
done
|
|
||||||
|
|
||||||
# Unseal Vault
|
|
||||||
echo "🔓 Unsealing..."
|
|
||||||
curl -s --cacert botserver-stack/conf/system/certificates/ca/ca.crt \
|
|
||||||
-X POST \
|
|
||||||
-H "X-Vault-Token: hvs.JjKHlEzycO2jvKdhhlRAoODu" \
|
|
||||||
-d "{\"key\": \"$UNSEAL_KEY\"}" \
|
|
||||||
https://localhost:8200/v1/sys/unseal
|
|
||||||
|
|
||||||
echo "✅ Vault unsealed"
|
|
||||||
Loading…
Add table
Reference in a new issue