Science Commit 5.

Author: mearvk

.gitignore

@@ -47,6 +47,10 @@ build/
 ### Secrets ###
 psychiatry/secrets/secret.key
 **/.db-credentials
+**/db.properties
+!**/db.properties.example
+.nwe-credentials
+configuration/credentials.local
 
 ### Transfer Documents ###
 source/confermary/transfer.document.title

.nwe-credentials.example

@@ -0,0 +1,12 @@
+# NWE Local Credentials — Example Template
+# Copy to .nwe-credentials and fill in your values:
+#   cp .nwe-credentials.example .nwe-credentials
+#   chmod 600 .nwe-credentials
+#
+# Scripts source this to get DB credentials.
+# .nwe-credentials is .gitignored and will never be committed.
+
+NWE_DB_HOST="127.0.0.1"
+NWE_DB_PORT="3306"
+NWE_DB_USER="root"
+NWE_DB_PASS="CHANGE_ME"

db.properties.example

@@ -0,0 +1,11 @@
+# NWE Module Database Configuration — Example Template
+# Copy to db.properties and fill in your values:
+#   cp db.properties.example db.properties
+#
+# db.properties is .gitignored and will never be committed.
+# Deploy scripts auto-generate this from .nwe-credentials if missing.
+
+db.driver=com.mysql.cj.jdbc.Driver
+db.url=jdbc:mysql://127.0.0.1:3306/DATABASE_NAME_HERE
+db.user=root
+db.password=CHANGE_ME

modules/AE6E66/servlets/servlet/src/main/webapp/WEB-INF/db.properties

@@ -7,7 +7,10 @@ set -e
 # Can be run repeatedly after git pull without risk to production databases.
 
 DB_USER="root"
-DB_PASS='$$Ironman1'
+# Load from .nwe-credentials
+NWE_ROOT="$(cd "$(dirname "$0")/../../.." 2>/dev/null && pwd)"
+[ -f "$NWE_ROOT/.nwe-credentials" ] && source "$NWE_ROOT/.nwe-credentials"
+DB_PASS="${NWE_DB_PASS:-'$$Ironman1'}" 
 DB_HOST="127.0.0.1"
 DB_NAME="nwe_ae6e66"
 MYSQL="mysql -u$DB_USER -p$DB_PASS -h$DB_HOST"

modules/AE6E66/servlets/setup-db.sh

@@ -21,7 +21,7 @@ JDBC_JAR=$(find "$(dirname "$BELT_ROOT")" -name "mysql-connector-j*.jar" -type f
 [ -n "$JDBC_JAR" ] && cp "$JDBC_JAR" "$DEPLOY_DIR/WEB-INF/lib/" && echo "[*] MySQL connector: $(basename "$JDBC_JAR")"
 chown -R tomcat:tomcat "$DEPLOY_DIR" 2>/dev/null || true
 # Setup DB
-mysql -u root -p'$$Ironman1' -h 127.0.0.1 <<'SQL'
+_NWE="$(cd "$(dirname "$0")/../../.." 2>/dev/null && pwd)"; [ -f "$_NWE/.nwe-credentials" ] && source "$_NWE/.nwe-credentials"; mysql -u "${NWE_DB_USER:-root}" -p"${NWE_DB_PASS:-'$$Ironman1'}"  -h 127.0.0.1 <<'SQL'
 CREATE DATABASE IF NOT EXISTS nwe_blackbelt CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 USE nwe_blackbelt;
 CREATE TABLE IF NOT EXISTS questions (id INT AUTO_INCREMENT PRIMARY KEY, question TEXT, answer TEXT, ip VARCHAR(45), asked_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, INDEX idx_time(asked_at));