updated to docker containers new name
This commit is contained in:
onysd
parent
0e5da4c8aa
commit
d37ecf6071
9 changed files with 216 additions and 249 deletions
124
start-server.sh
124
start-server.sh
|
|
@ -2,11 +2,7 @@
|
|||
set -euo pipefail
|
||||
cd "$(dirname "$0")"
|
||||
|
||||
ENV_EXAMPLE=".env.example"
|
||||
ENV_FILE=".env"
|
||||
IP_FILE=".public_ip"
|
||||
PREFIX_FILE=".link_prefix"
|
||||
SECRETS_FILE=".secrets"
|
||||
COMPOSE_FILE="deploy/docker-compose.yml"
|
||||
LOG_DIR="logs"
|
||||
|
||||
|
|
@ -28,105 +24,21 @@ log() { echo "[cfg] $*"; }
|
|||
step() { echo; echo "== $* =="; }
|
||||
die() { echo "[ERROR] $*" >&2; exit 1; }
|
||||
|
||||
random_hex() {
|
||||
local bytes="${1:-32}"
|
||||
openssl rand -hex "$bytes" 2>/dev/null || head -c "$bytes" /dev/urandom | xxd -p | tr -d '\n' | head -c $((bytes * 2))
|
||||
}
|
||||
# This script only starts the server — it never writes or edits .env. Set up
|
||||
# .env yourself (from .env.example) before running it.
|
||||
[[ -f "$ENV_FILE" ]] || die "${ENV_FILE} not found — copy .env.example to ${ENV_FILE} and configure it first"
|
||||
|
||||
random_string() {
|
||||
local len="${1:-24}"
|
||||
openssl rand -base64 "$((len * 2))" 2>/dev/null | tr -dc 'a-zA-Z0-9' | head -c "$len" \
|
||||
|| head -c 256 /dev/urandom | base64 | tr -dc 'a-zA-Z0-9' | head -c "$len"
|
||||
}
|
||||
|
||||
# --- Public address (interactive) ------------------------------------------
|
||||
DEFAULT_IP=""
|
||||
[[ -f "$IP_FILE" ]] && DEFAULT_IP="$(tr -d '[:space:]' < "$IP_FILE")"
|
||||
if [[ -z "$DEFAULT_IP" ]]; then
|
||||
DEFAULT_IP="$(curl -fsS --max-time 3 https://api.ipify.org 2>/dev/null || true)"
|
||||
fi
|
||||
|
||||
if [[ -n "$DEFAULT_IP" ]]; then
|
||||
read -rp "Public server IP/host [${DEFAULT_IP}]: " PUBLIC_IP
|
||||
else
|
||||
read -rp "Public server IP/host: " PUBLIC_IP
|
||||
fi
|
||||
PUBLIC_IP="${PUBLIC_IP:-$DEFAULT_IP}"
|
||||
[[ -z "$PUBLIC_IP" ]] && die "public IP/host is required."
|
||||
echo "$PUBLIC_IP" > "$IP_FILE"
|
||||
log "public address = ${PUBLIC_IP}"
|
||||
|
||||
# --- Link prefix / me_url_prefix (interactive) -----------------------------
|
||||
DEFAULT_PREFIX="$PUBLIC_IP"
|
||||
[[ -f "$PREFIX_FILE" ]] && DEFAULT_PREFIX="$(tr -d '[:space:]' < "$PREFIX_FILE")"
|
||||
read -rp "Link prefix (me_url_prefix, e.g. ${PUBLIC_IP} or chat.example.com) [${DEFAULT_PREFIX}]: " LINK_PREFIX
|
||||
LINK_PREFIX="${LINK_PREFIX:-$DEFAULT_PREFIX}"
|
||||
LINK_PREFIX="$(printf '%s' "$LINK_PREFIX" | sed -E 's#^https?://##; s#/+$##')"
|
||||
[[ -z "$LINK_PREFIX" ]] && die "link prefix is required."
|
||||
echo "$LINK_PREFIX" > "$PREFIX_FILE"
|
||||
log "link prefix (me_url_prefix) = ${LINK_PREFIX}"
|
||||
|
||||
# --- Secrets (generated once, cached) --------------------------------------
|
||||
load_or_gen_secrets() {
|
||||
local admin_token="" admin_password="" session_key=""
|
||||
|
||||
if [[ -f "$SECRETS_FILE" ]]; then
|
||||
# shellcheck disable=SC1090
|
||||
source "$SECRETS_FILE" 2>/dev/null || true
|
||||
fi
|
||||
|
||||
if [[ -z "${ADMIN_TOKEN:-}" ]]; then
|
||||
ADMIN_TOKEN="$(random_hex 32)"
|
||||
fi
|
||||
if [[ -z "${ADMIN_PASSWORD:-}" ]]; then
|
||||
ADMIN_PASSWORD="$(random_string 24)"
|
||||
fi
|
||||
if [[ -z "${SESSION_KEY:-}" ]]; then
|
||||
SESSION_KEY="$(random_string 48)"
|
||||
fi
|
||||
|
||||
cat > "$SECRETS_FILE" <<EOF
|
||||
ADMIN_TOKEN=${ADMIN_TOKEN}
|
||||
ADMIN_PASSWORD=${ADMIN_PASSWORD}
|
||||
SESSION_KEY=${SESSION_KEY}
|
||||
EOF
|
||||
chmod 600 "$SECRETS_FILE"
|
||||
log "secrets loaded from ${SECRETS_FILE}"
|
||||
}
|
||||
|
||||
load_or_gen_secrets
|
||||
|
||||
# --- Generate .env from .env.example --------------------------------------
|
||||
if [[ ! -f "$ENV_EXAMPLE" ]]; then
|
||||
die "template file ${ENV_EXAMPLE} not found"
|
||||
fi
|
||||
|
||||
cp "$ENV_EXAMPLE" "$ENV_FILE"
|
||||
|
||||
set_env() {
|
||||
local key="$1" value="$2"
|
||||
if grep -qE "^${key}=" "$ENV_FILE"; then
|
||||
sed -i -E "s|^${key}=.*|${key}=${value}|" "$ENV_FILE"
|
||||
else
|
||||
echo "${key}=${value}" >> "$ENV_FILE"
|
||||
fi
|
||||
}
|
||||
|
||||
set_env "TELESRV_ADVERTISE_IP" "$PUBLIC_IP"
|
||||
set_env "TELESRV_TURN_ADVERTISE_IP" "$PUBLIC_IP"
|
||||
set_env "TELESRV_SFU_ADVERTISE_IP" "$PUBLIC_IP"
|
||||
set_env "TELESRV_PUBLIC_BASE_URL" "https://${LINK_PREFIX}"
|
||||
set_env "TELESRV_PASSKEY_RP_ID" "$LINK_PREFIX"
|
||||
set_env "TELESRV_PUBLIC_APP_SCHEME" "owpg"
|
||||
set_env "TELESRV_PUBLIC_APP_NAME" "OwpenGram"
|
||||
set_env "TELESRV_ADMIN_API_TOKEN" "$ADMIN_TOKEN"
|
||||
set_env "TELESRV_ADMIN_UI_PASSWORD" "$ADMIN_PASSWORD"
|
||||
set_env "TELESRV_ADMIN_SESSION_KEY" "$SESSION_KEY"
|
||||
set_env "TELESRV_ADMIN_UI_ADDR" "127.0.0.1:2600"
|
||||
set_env "TELESRV_ADMIN_API_ADDR" "127.0.0.1:2399"
|
||||
set_env "TELESRV_PUBLIC_LINK_WEB_ADDR" "127.0.0.1:2401"
|
||||
|
||||
log ".env written (${ENV_FILE})"
|
||||
# --- Docker container/volume naming (telesrv -> owpengram), one-time, opt-in
|
||||
# Resolves whether this install uses the new "owpengram" Docker naming or (if
|
||||
# telesrv_* volumes exist and the user declined migrating them) keeps the old
|
||||
# "telesrv" naming permanently. See deploy/migrate-docker-naming.ps1.
|
||||
NAMING_OUT="$(powershell -NoProfile -ExecutionPolicy Bypass -File deploy/migrate-docker-naming.ps1)" \
|
||||
|| die "docker naming resolution failed"
|
||||
DOCKER_PROJECT="$(sed -n '1p' <<<"$NAMING_OUT")"
|
||||
DOCKER_PREFIX="$(sed -n '2p' <<<"$NAMING_OUT")"
|
||||
export TELESRV_DOCKER_PROJECT="$DOCKER_PROJECT"
|
||||
export TELESRV_DOCKER_PREFIX="$DOCKER_PREFIX"
|
||||
log "docker naming = ${DOCKER_PREFIX} (project ${DOCKER_PROJECT})"
|
||||
|
||||
# --- Start infrastructure (PostgreSQL + Redis) -----------------------------
|
||||
step "[1/4] Starting infrastructure (PostgreSQL + Redis)"
|
||||
|
|
@ -135,7 +47,7 @@ docker compose -f "$COMPOSE_FILE" up -d
|
|||
# --- Wait for PostgreSQL ---------------------------------------------------
|
||||
step "[2/4] Waiting for PostgreSQL"
|
||||
for i in $(seq 1 30); do
|
||||
if docker exec telesrv-postgres pg_isready -U telesrv -d telesrv >/dev/null 2>&1; then
|
||||
if docker exec "${DOCKER_PREFIX}-postgres" pg_isready -U telesrv -d telesrv >/dev/null 2>&1; then
|
||||
echo "[ok] PostgreSQL is ready"
|
||||
break
|
||||
fi
|
||||
|
|
@ -198,12 +110,6 @@ echo "============================================"
|
|||
echo " OwpenGram server is running"
|
||||
echo "============================================"
|
||||
echo ""
|
||||
echo " MTProto: ${PUBLIC_IP}:2398"
|
||||
echo " Admin UI: http://127.0.0.1:2600"
|
||||
echo " Admin API: http://127.0.0.1:2399"
|
||||
echo ""
|
||||
echo " Admin login password: ${ADMIN_PASSWORD}"
|
||||
echo ""
|
||||
echo " Logs:"
|
||||
echo " telesrv: tail -f ${TELESRV_LOG}"
|
||||
echo " telesrv-admin: tail -f ${ADMIN_LOG}"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue