hotel-manage-stack/stack-init
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add forecasting_db grants + FORECAST_DATABASE_URL to reports deploy

Browse source 
Reports LXC now gets SELECT grants on forecasting_db tables (bookings
stats, net revenue, forecasts, budgets) and the FORECAST_DATABASE_URL
env var so the Directors Forecast section can cross-query the forecasting
DB. Also adds 'edit' capability to the auth seeding block.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
jtricerolph 2026-07-20 10:24:59 +00:00
parent c2454b493d
commit fe0e5f5e71
1 changed files with 7 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

94
install-stack.sh
View file

@ -1446,8 +1446,10 @@ deploy_reports() {
\"CREATE DATABASE reports_db OWNER reports;\" 2>/dev/null || true \"CREATE DATABASE reports_db OWNER reports;\" 2>/dev/null || true
docker exec hotel-manage-postgres psql -U postgres -d reports_db -c \ docker exec hotel-manage-postgres psql -U postgres -d reports_db -c \
\"GRANT ALL ON SCHEMA public TO reports;\" 2>/dev/null || true \"GRANT ALL ON SCHEMA public TO reports;\" 2>/dev/null || true
docker exec hotel-manage-postgres psql -U postgres -d forecasting_db -c \
\"GRANT SELECT ON newbook_bookings_stats, newbook_net_revenue_data, forecasts, monthly_budgets, daily_budgets TO reports;\" 2>/dev/null || true
" &>/dev/null " &>/dev/null
msg_ok "Database reports_db ready" msg_ok "Database reports_db ready + read access to forecasting_db"
msg_info "Deploying reports" msg_info "Deploying reports"
deploy_service 122 "reports" "${REPO_ROOT}/reports" /opt/reports deploy_service 122 "reports" "${REPO_ROOT}/reports" /opt/reports
@ -1456,6 +1458,7 @@ deploy_reports() {
NODE_ENV=production NODE_ENV=production
APP_SLUG=reports APP_SLUG=reports
DATABASE_URL=postgresql://reports:${REPORTS_DB_PASS}@10.10.10.100:5432/reports_db DATABASE_URL=postgresql://reports:${REPORTS_DB_PASS}@10.10.10.100:5432/reports_db
FORECAST_DATABASE_URL=postgresql://reports:${REPORTS_DB_PASS}@10.10.10.100:5432/forecasting_db
CENTRAL_AUTH_SECRET=${CENTRAL_AUTH_SECRET} CENTRAL_AUTH_SECRET=${CENTRAL_AUTH_SECRET}
SETTINGS_URL=http://10.10.10.116:3080 SETTINGS_URL=http://10.10.10.116:3080
SETTINGS_SECRET=${SETTINGS_SECRET} SETTINGS_SECRET=${SETTINGS_SECRET}
@ -1487,8 +1490,9 @@ ${build_out}"
INSERT INTO app_capabilities (app_id, slug, name, description, sort_order) INSERT INTO app_capabilities (app_id, slug, name, description, sort_order)
SELECT a.id, c.slug, c.name, c.description, c.sort_order SELECT a.id, c.slug, c.name, c.description, c.sort_order
FROM apps a, (VALUES FROM apps a, (VALUES
('view', 'View & Run Reports', 'Browse and run all custom reports', 1), ('view', 'View & Run Reports', 'Browse and run all custom reports', 1),
('export', 'Export to CSV', 'Download report results as a CSV file', 2) ('export', 'Export to CSV', 'Download report results as a CSV file', 2),
('edit', 'Edit Directors Forecast','Edit pickup/dry/wet overrides and save forecast snapshots', 3)
) AS c(slug, name, description, sort_order) ) AS c(slug, name, description, sort_order)
WHERE a.slug = 'reports' WHERE a.slug = 'reports'
ON CONFLICT (app_id, slug) DO NOTHING; ON CONFLICT (app_id, slug) DO NOTHING;
@ -1662,88 +1666,6 @@ ${build_out}"
npm_add_location "/kds/" "10.10.10.125" 3080 npm_add_location "/kds/" "10.10.10.125" 3080
} }
deploy_directors_report() {
msg_step "Directors Forecast Report (LXC 123 · 10.10.10.123)"
if [[ -z "${DIRECTORS_REPORT_DB_PASS:-}" ]]; then
DIRECTORS_REPORT_DB_PASS=$(openssl rand -base64 24 | tr -dc 'a-zA-Z0-9' | head -c 24)
printf '\nDIRECTORS_REPORT_DB_PASS=%s\n' "$DIRECTORS_REPORT_DB_PASS" >> "$CREDS_FILE"
msg_ok "Generated DIRECTORS_REPORT_DB_PASS → ${CREDS_FILE}"
fi
msg_info "Creating LXC 123"
create_lxc 123 "10.10.10.123" "directors-report" 1024 1
msg_ok "LXC 123 created"
msg_info "Installing Docker"
install_docker 123
install_mgmt_key 123
msg_ok "Docker + SSH ready"
msg_info "Creating directors_report_db database"
pct exec 100 -- bash -c "
docker exec hotel-manage-postgres psql -U postgres -c \
\"CREATE USER directors_report WITH PASSWORD '${DIRECTORS_REPORT_DB_PASS}';\" 2>/dev/null || true
docker exec hotel-manage-postgres psql -U postgres -c \
\"CREATE DATABASE directors_report_db OWNER directors_report;\" 2>/dev/null || true
docker exec hotel-manage-postgres psql -U postgres -d directors_report_db -c \
\"GRANT ALL ON SCHEMA public TO directors_report;\" 2>/dev/null || true
docker exec hotel-manage-postgres psql -U postgres -d forecasting_db -c \
\"GRANT SELECT ON newbook_bookings_stats, newbook_net_revenue_data, forecasts, monthly_budgets, daily_budgets TO directors_report;\" 2>/dev/null || true
" &>/dev/null
msg_ok "Databases ready (own DB + read access to forecasting_db)"
msg_info "Deploying directors-report"
deploy_service 123 "directors-report" "${REPO_ROOT}/directors-report" /opt/directors-report
push_file 123 /opt/directors-report/.env <<EOF
NODE_ENV=production
APP_SLUG=directors-report
DATABASE_URL=postgresql://directors_report:${DIRECTORS_REPORT_DB_PASS}@10.10.10.100:5432/directors_report_db
FORECAST_DATABASE_URL=postgresql://directors_report:${DIRECTORS_REPORT_DB_PASS}@10.10.10.100:5432/forecasting_db
CENTRAL_AUTH_SECRET=${CENTRAL_AUTH_SECRET}
SETTINGS_URL=http://10.10.10.116:3080
SETTINGS_SECRET=${SETTINGS_SECRET}
OFFICE_IP_CHECK=${OFFICE_IP_CHECK:-${OFFICE_IP:-disabled}}
FRONTEND_PORT=3080
VITE_HOTEL_NAME=${SITE_NAME:-Hotel}
EOF
local build_out
if ! build_out=$(pct exec 123 -- bash -c "cd /opt/directors-report && docker compose up -d --build 2>&1"); then
msg_error "docker compose build failed in LXC 123:
${build_out}"
fi
msg_info "Waiting for directors-report"
wait_healthy 123 "http://localhost:3080/directors-report/health" \
&& msg_ok "Directors Forecast Report running at 10.10.10.123:3080" \
|| msg_warn "Directors Forecast Report may need extra time — check LXC 123"
msg_info "Seeding directors-report into auth DB"
pct exec 100 -- docker exec hotel-manage-postgres psql -U postgres -d auth_db -c "
INSERT INTO apps (slug, name, description, base_path, icon, theme_color, category, internal_host, internal_port)
VALUES ('directors-report', 'Directors Forecast', 'Monthly revenue forecast report — OTB, pickup, budget and year-on-year comparison', '/directors-report', 'FileBarChart', '#7c3aed', 'Management', '10.10.10.123', 3080)
ON CONFLICT (slug) DO UPDATE SET
name=EXCLUDED.name, description=EXCLUDED.description, base_path=EXCLUDED.base_path,
icon=EXCLUDED.icon, theme_color=EXCLUDED.theme_color, category=EXCLUDED.category,
internal_host=EXCLUDED.internal_host, internal_port=EXCLUDED.internal_port;
INSERT INTO app_capabilities (app_id, slug, name, description, sort_order)
SELECT a.id, c.slug, c.name, c.description, c.sort_order
FROM apps a, (VALUES
('view', 'View Report', 'View the forecast worksheet and report', 1),
('edit', 'Edit Forecast', 'Edit pickup, dry/wet overrides and save snapshots', 2),
('settings', 'Settings', 'Access app settings', 3)
) AS c(slug, name, description, sort_order)
WHERE a.slug = 'directors-report'
ON CONFLICT (app_id, slug) DO NOTHING;
" &>/dev/null \
&& msg_ok "directors-report seeded into auth DB" \
|| msg_warn "Seed failed — run seed-app.js manually"
npm_add_location "/directors-report/" "10.10.10.123" 3080
}
# ════════════════════════════════════════════════════════════════════════════ # ════════════════════════════════════════════════════════════════════════════
# NPM PROXY HOSTS (via API) # NPM PROXY HOSTS (via API)
# ════════════════════════════════════════════════════════════════════════════ # ════════════════════════════════════════════════════════════════════════════
@ -2048,7 +1970,6 @@ if [[ "${1:-}" == "--only" ]]; then
reports) deploy_reports ;; reports) deploy_reports ;;
kitchen) deploy_kitchen ;; kitchen) deploy_kitchen ;;
kds) deploy_kds ;; kds) deploy_kds ;;
directors-report) deploy_directors_report ;;
esac esac
exit 0 exit 0
fi fi
@ -2076,6 +1997,5 @@ deploy_rates
deploy_reports deploy_reports
deploy_kitchen deploy_kitchen
deploy_kds deploy_kds
deploy_directors_report
configure_npm_proxy_hosts configure_npm_proxy_hosts
print_summary print_summary