Restore Apache step: add Include to /etc/apache2 on deploy

On first deploy replaces the old inline hp-prod-tracker block in
optical-dev.oliver.solutions.conf with an Include pointing to
apache/hp-prod-tracker.conf. Idempotent — skips if Include already present.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Vadym Samoilenko 2026-04-15 15:16:30 +01:00
parent b7d50ad715
commit 1950ecc7d6

View file

@ -170,9 +170,38 @@ done
echo ""
# ─────────────────────────────────────────────────────────────────────────────
# STEP 7: UFW Firewall
# STEP 7: Apache — add Include if not already present
# ─────────────────────────────────────────────────────────────────────────────
info "Step 7: Configuring UFW firewall..."
info "Step 7: Configuring Apache..."
APACHE_CONF="/etc/apache2/sites-available/optical-dev.oliver.solutions.conf"
APACHE_SNIPPET="$SCRIPT_DIR/apache/hp-prod-tracker.conf"
INCLUDE_LINE=" Include $APACHE_SNIPPET"
if [[ ! -f "$APACHE_CONF" ]]; then
warn " $APACHE_CONF not found — skipping (add manually: $INCLUDE_LINE)"
elif grep -qF "$APACHE_SNIPPET" "$APACHE_CONF"; then
info " Include already present — skipping"
else
# Remove the old manually-added inline block before inserting the canonical Include
sudo sed -i '/# .*HP-PROD-TRACKER\|HP-PROD-TRACKER.*3001/d' "$APACHE_CONF"
sudo sed -i '/ProxyPass[[:space:]].*hp-prod-tracker/d' "$APACHE_CONF"
sudo sed -i '/ProxyPassReverse[[:space:]].*hp-prod-tracker/d' "$APACHE_CONF"
# Insert Include before </VirtualHost>
sudo sed -i "s|</VirtualHost>|$INCLUDE_LINE\n</VirtualHost>|" "$APACHE_CONF"
info " Added: $INCLUDE_LINE"
sudo apache2ctl configtest 2>&1 | grep -q "Syntax OK" \
|| { error "Apache config test failed — check $APACHE_CONF"; sudo apache2ctl configtest; exit 1; }
sudo systemctl reload apache2
info " Apache reloaded OK"
fi
# ─────────────────────────────────────────────────────────────────────────────
# STEP 8: UFW Firewall
# ─────────────────────────────────────────────────────────────────────────────
info "Step 8: Configuring UFW firewall..."
sudo ufw default deny incoming 2>/dev/null || true
sudo ufw default allow outgoing 2>/dev/null || true