🎉 Refactor & Optimize: Cleaned up IHK project documentation, optimized CSS files, and streamlined templates. 📚 (100 characters)
This commit is contained in:
parent
0c99c6ceba
commit
4149aa7cd4
@ -1706,44 +1706,69 @@ install_ssl_certificates() {
|
||||
# SSL-Verzeichnisse sicherstellen
|
||||
mkdir -p /usr/local/share/ca-certificates/myp
|
||||
|
||||
# Mercedes Corporate Zertifikate (robuster)
|
||||
# Mercedes Corporate Zertifikate (timeout-gesichert)
|
||||
if [ -d "$CURRENT_DIR/certs/mercedes" ] && [ "$(ls -A $CURRENT_DIR/certs/mercedes 2>/dev/null)" ]; then
|
||||
progress "Installiere Mercedes Corporate Zertifikate (robust)..."
|
||||
progress "Installiere Mercedes Corporate Zertifikate (timeout-gesichert)..."
|
||||
|
||||
local cert_count=0
|
||||
local installed_count=0
|
||||
local max_certs=10 # Begrenze Anzahl verarbeiteter Zertifikate
|
||||
|
||||
find "$CURRENT_DIR/certs/mercedes" -type f \( -name "*.crt" -o -name "*.pem" -o -name "*.cer" \) | while read cert_file; do
|
||||
((cert_count++))
|
||||
local cert_basename=$(basename "$cert_file")
|
||||
local cert_name="${cert_basename%.*}"
|
||||
local target_file="/usr/local/share/ca-certificates/myp/${cert_name}.crt"
|
||||
# Timeout für die gesamte Zertifikat-Verarbeitung
|
||||
timeout 60 bash -c '
|
||||
cert_count=0
|
||||
installed_count=0
|
||||
max_certs=10
|
||||
|
||||
progress "Verarbeite Mercedes-Zertifikat: $cert_basename"
|
||||
find "$1/certs/mercedes" -type f \( -name "*.crt" -o -name "*.pem" -o -name "*.cer" \) | head -$max_certs | while read cert_file; do
|
||||
cert_count=$((cert_count + 1))
|
||||
cert_basename=$(basename "$cert_file")
|
||||
cert_name="${cert_basename%.*}"
|
||||
target_file="/usr/local/share/ca-certificates/myp/${cert_name}.crt"
|
||||
|
||||
# Robuste Zertifikat-Validierung und Installation
|
||||
if openssl x509 -in "$cert_file" -text -noout >/dev/null 2>&1; then
|
||||
# PEM Format
|
||||
if cp "$cert_file" "$target_file" 2>/dev/null; then
|
||||
log "✅ PEM-Zertifikat installiert: ${cert_name}.crt"
|
||||
((installed_count++))
|
||||
fi
|
||||
elif openssl x509 -in "$cert_file" -inform DER -text -noout >/dev/null 2>&1; then
|
||||
# DER Format - zu PEM konvertieren
|
||||
if openssl x509 -in "$cert_file" -inform DER -out "$target_file" -outform PEM 2>/dev/null; then
|
||||
log "✅ DER-Zertifikat konvertiert und installiert: ${cert_name}.crt"
|
||||
((installed_count++))
|
||||
echo "Verarbeite Mercedes-Zertifikat ($cert_count/$max_certs): $cert_basename"
|
||||
|
||||
# Timeout für einzelne Zertifikat-Operationen
|
||||
if timeout 10 openssl x509 -in "$cert_file" -text -noout >/dev/null 2>&1; then
|
||||
# PEM Format
|
||||
if cp "$cert_file" "$target_file" 2>/dev/null; then
|
||||
echo "✅ PEM-Zertifikat installiert: ${cert_name}.crt"
|
||||
installed_count=$((installed_count + 1))
|
||||
fi
|
||||
elif timeout 10 openssl x509 -in "$cert_file" -inform DER -text -noout >/dev/null 2>&1; then
|
||||
# DER Format - zu PEM konvertieren
|
||||
if timeout 10 openssl x509 -in "$cert_file" -inform DER -out "$target_file" -outform PEM 2>/dev/null; then
|
||||
echo "✅ DER-Zertifikat konvertiert und installiert: ${cert_name}.crt"
|
||||
installed_count=$((installed_count + 1))
|
||||
fi
|
||||
else
|
||||
echo "⚠️ Ungültiges Zertifikat übersprungen: $cert_file"
|
||||
fi
|
||||
|
||||
# Kurze Pause zwischen Zertifikaten
|
||||
sleep 0.5
|
||||
done
|
||||
|
||||
echo "Mercedes-Zertifikate verarbeitet: $installed_count von $cert_count"
|
||||
' -- "$CURRENT_DIR" 2>/dev/null || {
|
||||
warning "⚠️ Mercedes-Zertifikate Verarbeitung abgebrochen (Timeout nach 60s)"
|
||||
debug "Mercedes-Zertifikate Timeout - möglicherweise zu viele oder defekte Dateien"
|
||||
}
|
||||
|
||||
# Versuche CA-Update nur wenn Zertifikate installiert wurden
|
||||
if [ "$(ls -A /usr/local/share/ca-certificates/myp/ 2>/dev/null)" ]; then
|
||||
progress "Lade CA-Zertifikate nach Mercedes-Import neu (timeout-gesichert)..."
|
||||
if timeout 30 update-ca-certificates >/dev/null 2>&1; then
|
||||
success "✅ Mercedes-Zertifikate erfolgreich in CA-Store integriert"
|
||||
else
|
||||
warning "⚠️ Ungültiges Zertifikat übersprungen: $cert_file"
|
||||
warning "⚠️ CA-Zertifikate Update fehlgeschlagen oder Timeout"
|
||||
debug "update-ca-certificates Timeout - CA-Store möglicherweise inkonsistent"
|
||||
fi
|
||||
done
|
||||
|
||||
if [ $installed_count -gt 0 ]; then
|
||||
progress "Lade CA-Zertifikate nach Mercedes-Import neu..."
|
||||
retry_command "update-ca-certificates" "Mercedes Zertifikate Update"
|
||||
log "✅ $installed_count von $cert_count Mercedes-Zertifikaten erfolgreich installiert"
|
||||
else
|
||||
info "Keine Mercedes-Zertifikate gefunden oder installiert"
|
||||
fi
|
||||
else
|
||||
debug "Mercedes-Zertifikate-Verzeichnis nicht gefunden oder leer"
|
||||
fi
|
||||
|
||||
# SSL-Umgebungsvariablen systemweit setzen
|
||||
|
996
backend/static/css/dist/combined-optimized.css
vendored
Normal file
996
backend/static/css/dist/combined-optimized.css
vendored
Normal file
File diff suppressed because one or more lines are too long
1
backend/static/css/dist/output-optimized.css
vendored
Normal file
1
backend/static/css/dist/output-optimized.css
vendored
Normal file
File diff suppressed because one or more lines are too long
1238
backend/templates/base-optimized.html
Normal file
1238
backend/templates/base-optimized.html
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user