chore(install): sync playbooks and installers with pve audit

aw-server/apply_webui_ru_patch.sh

@@ -9,13 +9,16 @@ fi
 
 source "$ENV_FILE"
 
-WEBUI_DIR="${AW_SERVER_WEBUI_DIR:-/opt/activitywatch/webui-ru}"
+WEBUI_DIR="${AW_SERVER_WEBUI_DIR:-${AW_WEBUI_DIR:-/opt/activitywatch/webui-ru}}"
 PATCH_JS_SRC="/root/bootstrap/aw-ru-patch.js"
 SW_CLEANUP_SRC="/root/bootstrap/aw-sw-cleanup.js"
 HOST_GROUPS_SRC="/root/bootstrap/aw-host-groups.json"
 INDEX_HTML="$WEBUI_DIR/index.html"
 SERVICE_WORKER="$WEBUI_DIR/service-worker.js"
 TS=$(date +%Y%m%d%H%M%S)
+PATCH_TARGET="$WEBUI_DIR/js/ru-patch-v5.js"
+SW_TARGET="$WEBUI_DIR/js/sw-cleanup.js"
+HOST_GROUPS_TARGET="$WEBUI_DIR/js/aw-host-groups.json"
 TRENDS_NEEDLE='this.activityStore.query_category_time_by_period(r)'
 TRENDS_REPLACEMENT='this.activityStore.ensure_loaded(r)'
 TIMESPIRAL_NEEDLE='start:new Date("2022-08-08")'
@@ -27,14 +30,17 @@ TIMESPIRAL_REPLACEMENT='start:new Date(Date.now()-12*36e5)'
 [[ -f "$INDEX_HTML" ]] || { echo "missing $INDEX_HTML" >&2; exit 1; }
 
 install -d "$WEBUI_DIR/js"
-install -m 0644 "$PATCH_JS_SRC" "$WEBUI_DIR/js/aw-ru-patch.js"
-install -m 0644 "$SW_CLEANUP_SRC" "$WEBUI_DIR/js/aw-sw-cleanup.js"
-install -m 0644 "$HOST_GROUPS_SRC" "$WEBUI_DIR/js/aw-host-groups.json"
+install -m 0644 "$PATCH_JS_SRC" "$PATCH_TARGET"
+install -m 0644 "$SW_CLEANUP_SRC" "$SW_TARGET"
+install -m 0644 "$HOST_GROUPS_SRC" "$HOST_GROUPS_TARGET"
 cp "$INDEX_HTML" "$INDEX_HTML.bak.$TS"
 
-sed -i '/aw-ru-patch.js/d;/aw-sw-cleanup.js/d' "$INDEX_HTML"
-sed -i 's#</head>#<script src="/js/aw-sw-cleanup.js"></script></head>#' "$INDEX_HTML"
-sed -i 's#</body>#<script defer="defer" src="/js/aw-ru-patch.js"></script></body>#' "$INDEX_HTML"
+patch_hash="$(sha1sum "$PATCH_TARGET" | awk '{print substr($1,1,12)}')"
+sw_hash="$(sha1sum "$SW_TARGET" | awk '{print substr($1,1,12)}')"
+
+sed -i '/ru-patch-v5.js/d;/sw-cleanup.js/d;/aw-ru-patch.js/d;/aw-sw-cleanup.js/d' "$INDEX_HTML"
+sed -i "s#</head>#<script src=\"/js/sw-cleanup.js?v=$sw_hash\"></script></head>#" "$INDEX_HTML"
+sed -i "s#</body>#<script defer=\"defer\" src=\"/js/ru-patch-v5.js?v=$patch_hash\"></script></body>#" "$INDEX_HTML"
 cp "$SW_CLEANUP_SRC" "$SERVICE_WORKER"
 
 trends_chunk="$(grep -Rsl "$TRENDS_NEEDLE" "$WEBUI_DIR/js"/*.js 2>/dev/null | head -n 1 || true)"
@@ -79,4 +85,4 @@ else
   echo "Timespiral hotfix skipped: chunk not found"
 fi
 
-echo "RU patch applied to $WEBUI_DIR"
+echo "RU patch applied to $WEBUI_DIR (ru-patch-v5.js?v=$patch_hash)"

aw-server/install_aw_server.sh

@@ -21,6 +21,10 @@ required_vars=(
   AW_SERVER_GROUP
 )
 
+BOOTSTRAP_DIR="/root/bootstrap"
+VIEWS_JSON="$BOOTSTRAP_DIR/settings/views-default.json"
+CLASSES_JSON="$BOOTSTRAP_DIR/settings/classes-worktime.json"
+
 for var_name in "${required_vars[@]}"; do
   if [[ -z "${!var_name:-}" ]]; then
     echo "missing required variable: $var_name" >&2
@@ -84,3 +88,30 @@ systemctl daemon-reload
 systemctl enable activitywatch-server.service
 systemctl restart activitywatch-server.service
 systemctl --no-pager --full status activitywatch-server.service || true
+
+for _ in $(seq 1 20); do
+  if curl -fsS "http://127.0.0.1:${AW_SERVER_PORT}/api/0/info" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 2
+done
+
+if [[ -f "$CLASSES_JSON" ]]; then
+  curl -fsS -X POST \
+    -H 'Content-Type: application/json' \
+    --data-binary @"$CLASSES_JSON" \
+    "http://127.0.0.1:${AW_SERVER_PORT}/api/0/settings/classes" >/dev/null
+  echo "Applied worktime classes from $CLASSES_JSON"
+else
+  echo "Worktime classes bootstrap not found, skipped: $CLASSES_JSON"
+fi
+
+if [[ -f "$VIEWS_JSON" ]]; then
+  curl -fsS -X POST \
+    -H 'Content-Type: application/json' \
+    --data-binary @"$VIEWS_JSON" \
+    "http://127.0.0.1:${AW_SERVER_PORT}/api/0/settings/views" >/dev/null
+  echo "Applied baseline views from $VIEWS_JSON"
+else
+  echo "Views bootstrap not found, skipped: $VIEWS_JSON"
+fi