Skip to content

Commit 8c04b1a

Browse files
committed
Science Commit 5.
1 parent e1e16b2 commit 8c04b1a

2 files changed

Lines changed: 79 additions & 0 deletions

File tree

modules/black/presidential/Brarner.M.Alete/install/after-pull.sh

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,42 @@ else
124124
mark_skip "No jars/ directory — skipping JAR sync"
125125
fi
126126

127+
# ─── JDBC driver check ───
128+
echo ""
129+
echo "[4b] JDBC driver verification..."
130+
131+
JDBC_JAR=$(find "$DEPLOY_DIR/WEB-INF/lib/" -name "mysql-connector-j*" -o -name "mysql-connector-java*" 2>/dev/null | head -1)
132+
if [ -n "$JDBC_JAR" ]; then
133+
mark_ok "MySQL JDBC driver present: $(basename "$JDBC_JAR")"
134+
else
135+
# Try to find it in source locations and copy
136+
FOUND_JAR=""
137+
for SEARCH in "$BMA_ROOT/jars" "$BMA_ROOT/lib" "/opt/tomcat/lib"; do
138+
FOUND_JAR=$(find "$SEARCH" -name "mysql-connector-j*" 2>/dev/null | head -1)
139+
[ -n "$FOUND_JAR" ] && break
140+
done
141+
if [ -n "$FOUND_JAR" ]; then
142+
mkdir -p "$DEPLOY_DIR/WEB-INF/lib"
143+
cp "$FOUND_JAR" "$DEPLOY_DIR/WEB-INF/lib/"
144+
mark_fix "JDBC driver copied: $(basename "$FOUND_JAR") → WEB-INF/lib/"
145+
NEEDS_TOMCAT_RESTART=1
146+
else
147+
mark_fail "MySQL JDBC driver NOT FOUND in WEB-INF/lib/, jars/, lib/, or /opt/tomcat/lib/"
148+
echo " Download: https://dev.mysql.com/downloads/connector/j/"
149+
echo " Or run: bash install/download-jars.sh"
150+
fi
151+
fi
152+
153+
# Also check Tomcat's shared lib as alternative classpath location
154+
TOMCAT_LIB_JDBC=$(find "$TOMCAT_HOME/lib/" -name "mysql-connector-j*" 2>/dev/null | head -1)
155+
if [ -n "$TOMCAT_LIB_JDBC" ]; then
156+
mark_ok "JDBC driver also in Tomcat shared lib: $(basename "$TOMCAT_LIB_JDBC")"
157+
elif [ -n "$JDBC_JAR" ] && [ ! -f "$TOMCAT_HOME/lib/$(basename "$JDBC_JAR")" ]; then
158+
# Symlink from WEB-INF/lib to Tomcat shared lib for reliability
159+
ln -sf "$JDBC_JAR" "$TOMCAT_HOME/lib/$(basename "$JDBC_JAR")" 2>/dev/null && \
160+
mark_fix "JDBC driver symlinked to $TOMCAT_HOME/lib/" || true
161+
fi
162+
127163
# ─── Ownership & symlinks ───
128164
chown -R tomcat:tomcat "$DEPLOY_DIR" 2>/dev/null || true
129165
ln -sfn "$DEPLOY_DIR" "$BMA_ROOT/www" 2>/dev/null || true
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
#!/bin/bash
2+
# Brarner.M.Alete™ — Fix Remote db.properties
3+
# Pushes the correct db.properties to the remote server and restarts Tomcat.
4+
# Usage: bash install/fix-remote-db.sh
5+
set -e
6+
7+
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
8+
BMA_ROOT="$(dirname "$SCRIPT_DIR")"
9+
DB_PROPS_LOCAL="$BMA_ROOT/servlets/servlet/src/main/webapp/WEB-INF/db.properties"
10+
11+
REMOTE_HOST="45.32.31.139"
12+
REMOTE_USER="${BMA_REMOTE_USER:-root}"
13+
TOMCAT_CONTEXT="brarner.m.alete"
14+
DB_PROPS_REMOTE="/opt/tomcat/webapps/${TOMCAT_CONTEXT}/WEB-INF/db.properties"
15+
16+
SSH_OPTS="-o ConnectTimeout=10 -o BatchMode=yes -o StrictHostKeyChecking=accept-new"
17+
18+
echo "═══════════════════════════════════════════════════════════════"
19+
echo " Brarner.M.Alete™ — Fix Remote db.properties"
20+
echo " Target: ${REMOTE_USER}@${REMOTE_HOST}:${DB_PROPS_REMOTE}"
21+
echo "═══════════════════════════════════════════════════════════════"
22+
23+
if [ ! -f "$DB_PROPS_LOCAL" ]; then
24+
echo "[FAIL] Local db.properties not found: $DB_PROPS_LOCAL"; exit 1
25+
fi
26+
27+
echo "[*] Local db.properties:"
28+
grep -v password "$DB_PROPS_LOCAL" | sed 's/^/ /'
29+
echo " db.password=********"
30+
echo ""
31+
32+
echo "[*] Pushing to remote..."
33+
scp $SSH_OPTS "$DB_PROPS_LOCAL" "$REMOTE_USER@$REMOTE_HOST:$DB_PROPS_REMOTE"
34+
ssh $SSH_OPTS "$REMOTE_USER@$REMOTE_HOST" "chmod 600 $DB_PROPS_REMOTE && chown tomcat:tomcat $DB_PROPS_REMOTE"
35+
echo "[OK] db.properties updated on remote"
36+
37+
echo "[*] Restarting Tomcat on remote..."
38+
ssh $SSH_OPTS "$REMOTE_USER@$REMOTE_HOST" "systemctl restart tomcat"
39+
echo "[OK] Tomcat restarted"
40+
41+
echo ""
42+
echo "[✓] Done. Verify: https://lauradei.us/brarner.m.alete/status.jsp"
43+
echo "═══════════════════════════════════════════════════════════════"

0 commit comments

Comments
 (0)