Daniel Maksymilian Syrnicki
c080764c7e
Root cause of today's 403 on a fresh install: assets/ lived inside the Python package at furtka/assets/, so the resource-manager tarball extracted to /opt/furtka/versions/<ver>/furtka/assets/. But Caddyfile has `root * /opt/furtka/current/assets/www`, systemd units point at /opt/furtka/current/assets/bin/furtka-status, and the install-time `systemctl link /opt/furtka/current/assets/systemd/*.service` expected the top-level layout. All three found nothing: - Caddy → 403 Forbidden (empty/missing document root) - systemctl link → silent no-op, nothing ever linked into /etc/systemd/system/ - furtka-api.service + furtka-reconcile.service → "inactive" because they were never registered Nothing in the Python package ever imported furtka.assets — these are shell scripts, HTML/CSS, systemd units, and a Caddyfile, which is config data, not package data. Promoting assets/ to the repo root matches how it's referenced everywhere downstream and eliminates the path mismatch. Changes: - git mv furtka/assets assets - iso/build.sh: tarball-staging step now also `cp -a "$REPO_ROOT/assets"` so the tarball ships ./assets at its root, and the live-ISO copy reads from $REPO_ROOT/assets instead of $REPO_ROOT/furtka/assets. - scripts/build-release-tarball.sh: same for release tarballs. - webinstaller/app.py: _resolve_assets_dir's dev fallback walks one level up to REPO_ROOT/assets/. - tests/test_webinstaller_assets.py: ASSETS constant updated. Tests still green (150/150) because both paths were fs-level — no code imports changed. Next ISO build will land assets at the path everything downstream expects. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
22 lines
656 B
Bash
Executable file
22 lines
656 B
Bash
Executable file
#!/bin/bash
|
|
# Regenerates /etc/issue on the installed system so the console tells the
|
|
# user which URL to open. Mirrors the live-ISO furtka-update-issue pattern.
|
|
set -e
|
|
|
|
hostname=$(cat /etc/hostname)
|
|
ip=$(ip -4 -o addr show scope global 2>/dev/null | awk '{print $4}' | cut -d/ -f1 | head -1)
|
|
|
|
{
|
|
echo
|
|
echo " Furtka is ready."
|
|
echo
|
|
echo " Open in a browser on another device on your network:"
|
|
echo
|
|
echo " http://${hostname}.local (easy — try this first)"
|
|
if [ -n "$ip" ]; then
|
|
echo " http://${ip} (fallback if the first doesn't work)"
|
|
fi
|
|
echo
|
|
} > /etc/issue
|
|
|
|
agetty --reload 2>/dev/null || true
|