feat: make reverse proxy operator-managed

scripts/test-update-fixture.sh

@@ -55,7 +55,7 @@ esac
 if [ -n "$output" ]; then
   if [ -n "${MOCK_RELEASE_API_URL:-}" ] && [ "$url" = "$MOCK_RELEASE_API_URL" ]; then
     cp "$FIXTURE_RELEASE_ROOT/release-api.json" "$output"
-  elif [ "$url" = "${KAIDI_PUBLIC_INDEX_URL:-http://127.0.0.1/}" ]; then
+  elif [ "$url" = "${KAIDI_APP_INDEX_URL:-http://127.0.0.1:18080/}" ]; then
     cp "$MOCK_APP_ROOT/current/public/index.html" "$output"
   else
     [ "${MOCK_DOWNLOAD_FAILURE:-}" != "${url##*/}" ] || exit 22
@@ -75,12 +75,6 @@ SH
 #!/bin/sh
 printf '%s\n' "$*" >> "$MOCK_SYSTEMCTL_LOG"
 exit 0
-SH
-
-  cat > "$mock_bin/nginx" <<'SH'
-#!/bin/sh
-printf '%s\n' "$*" >> "$MOCK_NGINX_LOG"
-exit 0
 SH
 
   cat > "$mock_bin/flock" <<'SH'
@@ -138,7 +132,7 @@ build_release() {
   printf '%s\n' "$version" > "$stage/VERSION"
   printf '#!/bin/sh\nprintf "new updater\\n"\n' > "$stage/ops/update.sh"
   chmod 0755 "$stage/ops/update.sh"
-  for name in kaidi-finance.service kaidi-update.service kaidi-update.path kaidi-finance.conf; do
+  for name in kaidi-finance.service kaidi-update.service kaidi-update.path; do
     printf 'new %s\n' "$name" > "$stage/ops/$name"
   done
 
@@ -174,7 +168,7 @@ prepare_installation() {
   local fixture=$1
   local version=$2
   mkdir -p "$fixture/app/releases/1.0.0-preview.1/public" "$fixture/app/bin" \
-    "$fixture/state/inbox" "$fixture/systemd" "$fixture/nginx" "$fixture/log"
+    "$fixture/state/inbox" "$fixture/systemd" "$fixture/log"
   printf 'old application\n' > "$fixture/app/releases/1.0.0-preview.1/app.jar"
   printf '<!doctype html><title>old</title>\n' > "$fixture/app/releases/1.0.0-preview.1/public/index.html"
   printf '1.0.0-preview.1\n' > "$fixture/app/releases/1.0.0-preview.1/VERSION"
@@ -184,7 +178,6 @@ prepare_installation() {
   for name in kaidi-finance.service kaidi-update.service kaidi-update.path; do
     printf 'old %s\n' "$name" > "$fixture/systemd/$name"
   done
-  printf 'old kaidi-finance.conf\n' > "$fixture/nginx/kaidi-finance.conf"
   write_request "$fixture" "$version" DOWNLOAD
 }
 
@@ -227,12 +220,10 @@ run_update() {
     MOCK_RELEASE_ORIGIN="${FIXTURE_RELEASE_ORIGIN:-https://release.fixture.invalid}" \
     MOCK_EXPECT_RELEASE_TOKEN="${FIXTURE_RELEASE_TOKEN-}" \
     MOCK_SYSTEMCTL_LOG="$fixture/systemctl.log" \
-    MOCK_NGINX_LOG="$fixture/nginx.log" \
     KAIDI_APP_ROOT="$fixture/app" \
     KAIDI_UPDATE_STATE_ROOT="$fixture/state" \
     KAIDI_LOG_ROOT="$fixture/log" \
     KAIDI_SYSTEMD_ROOT="$fixture/systemd" \
-    KAIDI_NGINX_CONFIG="$fixture/nginx/kaidi-finance.conf" \
     KAIDI_UPDATER_PATH="$fixture/app/bin/update.sh" \
     KAIDI_SKIP_DB_BACKUP="$skip_backup" \
     KAIDI_UPDATE_HEALTH_ATTEMPTS=1 \
@@ -243,9 +234,8 @@ run_update() {
     UPDATE_PUBLIC_KEY="$fixture/release-public.pem" \
     UPDATE_REQUEST_FILE="$fixture/state/inbox/request.json" \
     UPDATE_STATUS_FILE="$fixture/state/status.json" \
-    KAIDI_HEALTH_URL=http://127.0.0.1:18080/actuator/health \
-    KAIDI_PUBLIC_HEALTH_URL=http://127.0.0.1/actuator/health \
-    KAIDI_PUBLIC_INDEX_URL=http://127.0.0.1/ \
+    KAIDI_HEALTH_URL=http://127.0.0.1:19090/actuator/health \
+    KAIDI_APP_INDEX_URL=http://127.0.0.1:19090/ \
     "$ROOT/deploy/update.sh"
 }
 
@@ -319,7 +309,7 @@ assert_success_case() {
   [ ! -e "$fixture/state/processing/request.json" ] \
     || fail 'success case left a claimed request behind'
   grep -qx 'daemon-reload' "$fixture/systemctl.log" || fail 'systemd units were not reloaded'
-  grep -qx 'reload nginx' "$fixture/systemctl.log" || fail 'Nginx was not reloaded'
+  ! grep -qi nginx "$fixture/systemctl.log" || fail 'updater unexpectedly managed Nginx'
 }
 
 assert_rollback_case() {