From 73b7dd8f51c45b7901b6f9a89bb02df99058025a Mon Sep 17 00:00:00 2001 From: myoffice-sync Date: Wed, 5 Aug 2026 13:45:24 +0000 Subject: [PATCH] sync build tree from private myoffice --- proxmox/install-in-ct.sh | 16 ++++++++++++++++ proxmox/myoffice.sh | 21 +++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/proxmox/install-in-ct.sh b/proxmox/install-in-ct.sh index e17ed87..cc3ad9d 100644 --- a/proxmox/install-in-ct.sh +++ b/proxmox/install-in-ct.sh @@ -27,6 +27,17 @@ unset LANGUAGE LC_TIME LC_MESSAGES 2>/dev/null || true msg() { echo -e " ==> $*"; } +# TEMPORARY: map Gitea hostname → nginx LAN (override with GITEA_HOSTS_IP= to disable) +ensure_gitea_hosts() { + if [[ -z "${GITEA_HOSTS_IP:-}" ]]; then + return 0 + fi + local hn="${GITEA_HOSTS_NAME:-mygit.ase.com.ua}" + sed -i "/[[:space:]]${hn}\$/d" /etc/hosts + echo "${GITEA_HOSTS_IP} ${hn}" >> /etc/hosts + msg "hosts: ${GITEA_HOSTS_IP} ${hn}" +} + as_postgres() { # Script runs as root in CT; sudo is not installed. # cd away from /root — postgres cannot access it (harmless but noisy otherwise). @@ -176,8 +187,12 @@ GITEA_OWNER=${GITEA_OWNER:-} GITEA_REPO=${GITEA_REPO:-myoffice_public} RELEASE_TAG=${RELEASE_TAG:-latest} RELEASE_ASSET_URL=${RELEASE_ASSET_URL:-} +GITEA_HOSTS_IP=${GITEA_HOSTS_IP:-} +GITEA_HOSTS_NAME=${GITEA_HOSTS_NAME:-mygit.ase.com.ua} EOF + # TEMPORARY hosts also persisted above in env; already applied at start via ensure_gitea_hosts + systemctl daemon-reload systemctl enable myoffice-api if [[ -f "${API_DIR}/MyOffice.Web.dll" ]]; then @@ -202,6 +217,7 @@ print_done() { } detect_public_url +ensure_gitea_hosts install_base install_aspnet_runtime setup_postgres diff --git a/proxmox/myoffice.sh b/proxmox/myoffice.sh index 9a3e4fa..762d7a9 100644 --- a/proxmox/myoffice.sh +++ b/proxmox/myoffice.sh @@ -16,6 +16,11 @@ RELEASE_TAG="${RELEASE_TAG:-latest}" RELEASE_ASSET_URL="${RELEASE_ASSET_URL:-}" GITEA_TOKEN="${GITEA_TOKEN:-}" +# TEMPORARY: CT often resolves mygit to a public IP (hairpin fails). Map to nginx LAN. +# Remove when CT DNS/routing reaches Gitea correctly. Override: GITEA_HOSTS_IP= (empty = skip) +GITEA_HOSTS_IP="${GITEA_HOSTS_IP:-192.168.100.10}" +GITEA_HOSTS_NAME="${GITEA_HOSTS_NAME:-mygit.ase.com.ua}" + if [[ -z "${REPO_RAW_BASE:-}" ]]; then REPO_RAW_BASE="${GITEA_URL%/}/${GITEA_OWNER}/${GITEA_REPO}/raw/branch/${GITEA_BRANCH}" fi @@ -422,6 +427,19 @@ wait_for_network() { exit 1 } +# TEMPORARY hosts override inside CT (see GITEA_HOSTS_IP). +ensure_ct_gitea_hosts() { + if [[ -z "${GITEA_HOSTS_IP}" ]]; then + return 0 + fi + msg_info "CT /etc/hosts: ${GITEA_HOSTS_IP} ${GITEA_HOSTS_NAME}" + pct exec "$CTID" -- bash -c " + sed -i '/[[:space:]]${GITEA_HOSTS_NAME}\$/d' /etc/hosts + echo '${GITEA_HOSTS_IP} ${GITEA_HOSTS_NAME}' >> /etc/hosts + " + msg_ok "CT hosts updated" +} + resolve_script_dir() { if [[ -n "${BASH_SOURCE[0]:-}" && -f "${BASH_SOURCE[0]}" ]]; then SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" @@ -498,6 +516,8 @@ run_ct_install() { RELEASE_ASSET_URL="$RELEASE_ASSET_URL" \ GITEA_TOKEN="$GITEA_TOKEN" \ LOCAL_RELEASE_TAR="/tmp/myoffice-publish.tar.gz" \ + GITEA_HOSTS_IP="$GITEA_HOSTS_IP" \ + GITEA_HOSTS_NAME="$GITEA_HOSTS_NAME" \ bash /tmp/myoffice-proxmox/install-in-ct.sh msg_ok "Stack installed" } @@ -520,6 +540,7 @@ ensure_template resolve_script_dir create_container wait_for_network +ensure_ct_gitea_hosts push_install_assets run_ct_install