Code cleanup
This commit is contained in:
@@ -1,17 +1,13 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Termix SSL Quick Setup Script
|
||||
# Enables HTTPS/WSS with one command
|
||||
|
||||
set -e
|
||||
|
||||
# Colors for output
|
||||
RED='\033[0;31m'
|
||||
GREEN='\033[0;32m'
|
||||
YELLOW='\033[1;33m'
|
||||
BLUE='\033[0;34m'
|
||||
CYAN='\033[0;36m'
|
||||
NC='\033[0m' # No Color
|
||||
NC='\033[0m'
|
||||
|
||||
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
PROJECT_ROOT="$(dirname "$SCRIPT_DIR")"
|
||||
@@ -37,28 +33,12 @@ log_header() {
|
||||
echo -e "${CYAN}$1${NC}"
|
||||
}
|
||||
|
||||
print_banner() {
|
||||
echo ""
|
||||
echo "=============================================="
|
||||
log_header "🔒 Termix SSL Quick Setup"
|
||||
echo "=============================================="
|
||||
echo ""
|
||||
log_info "This script will:"
|
||||
echo " ✅ Generate SSL certificates automatically"
|
||||
echo " ✅ Create/update .env configuration"
|
||||
echo " ✅ Enable HTTPS/WSS support"
|
||||
echo " ✅ Generate security keys"
|
||||
echo ""
|
||||
}
|
||||
|
||||
generate_keys() {
|
||||
log_info "🔑 Generating security keys..."
|
||||
log_info "Generating security keys..."
|
||||
|
||||
# Generate JWT secret
|
||||
JWT_SECRET=$(openssl rand -hex 32)
|
||||
log_success "Generated JWT secret"
|
||||
|
||||
# Generate database key
|
||||
DATABASE_KEY=$(openssl rand -hex 32)
|
||||
log_success "Generated database encryption key"
|
||||
|
||||
@@ -69,14 +49,13 @@ generate_keys() {
|
||||
}
|
||||
|
||||
setup_env_file() {
|
||||
log_info "📝 Setting up environment configuration..."
|
||||
log_info "Setting up environment configuration..."
|
||||
|
||||
if [[ -f "$ENV_FILE" ]]; then
|
||||
log_warn "⚠️ .env file already exists, creating backup..."
|
||||
log_warn ".env file already exists, creating backup..."
|
||||
cp "$ENV_FILE" "$ENV_FILE.backup.$(date +%s)"
|
||||
fi
|
||||
|
||||
# Create or update .env file
|
||||
cat > "$ENV_FILE" << EOF
|
||||
# Termix SSL Configuration - Auto-generated $(date)
|
||||
|
||||
@@ -94,79 +73,30 @@ ALLOWED_ORIGINS=*
|
||||
|
||||
EOF
|
||||
|
||||
# Add security keys
|
||||
generate_keys
|
||||
|
||||
log_success "Environment configuration created at $ENV_FILE"
|
||||
}
|
||||
|
||||
setup_ssl_certificates() {
|
||||
log_info "🔐 Setting up SSL certificates..."
|
||||
log_info "Setting up SSL certificates..."
|
||||
|
||||
# Run SSL setup script
|
||||
if [[ -f "$SCRIPT_DIR/setup-ssl.sh" ]]; then
|
||||
bash "$SCRIPT_DIR/setup-ssl.sh"
|
||||
else
|
||||
log_error "❌ SSL setup script not found at $SCRIPT_DIR/setup-ssl.sh"
|
||||
log_error "SSL setup script not found at $SCRIPT_DIR/setup-ssl.sh"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
show_next_steps() {
|
||||
echo ""
|
||||
log_header "🚀 SSL Setup Complete!"
|
||||
echo ""
|
||||
log_success "Your Termix instance is now configured for HTTPS/WSS!"
|
||||
echo ""
|
||||
echo "Next steps:"
|
||||
echo ""
|
||||
echo "1. 🐳 Using Docker:"
|
||||
echo " docker-compose -f docker-compose.ssl.yml up"
|
||||
echo ""
|
||||
echo "2. 📦 Using npm:"
|
||||
echo " npm start"
|
||||
echo ""
|
||||
echo "3. 🌐 Access your application:"
|
||||
echo " • HTTPS: https://localhost:8443"
|
||||
echo " • HTTP: http://localhost:8080 (redirects to HTTPS)"
|
||||
echo ""
|
||||
echo "4. 📱 WebSocket connections will automatically use WSS"
|
||||
echo ""
|
||||
log_warn "⚠️ Browser Warning: Self-signed certificates will show security warnings"
|
||||
echo ""
|
||||
echo "For production deployment:"
|
||||
echo "• Replace self-signed certificates with CA-signed certificates"
|
||||
echo "• Update SSL_DOMAIN in .env to your actual domain"
|
||||
echo "• Set proper ALLOWED_ORIGINS for CORS"
|
||||
echo ""
|
||||
|
||||
# Show generated keys
|
||||
if [[ -f "$ENV_FILE" ]]; then
|
||||
echo "Generated security keys (keep these secure!):"
|
||||
echo "• JWT_SECRET: $(grep JWT_SECRET "$ENV_FILE" | cut -d= -f2)"
|
||||
echo "• DATABASE_KEY: $(grep DATABASE_KEY "$ENV_FILE" | cut -d= -f2)"
|
||||
echo ""
|
||||
fi
|
||||
}
|
||||
|
||||
# Main execution
|
||||
main() {
|
||||
print_banner
|
||||
|
||||
# Check prerequisites
|
||||
if ! command -v openssl &> /dev/null; then
|
||||
log_error "❌ OpenSSL is not installed. Please install OpenSSL first."
|
||||
log_error "OpenSSL is not installed. Please install OpenSSL first."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Setup environment
|
||||
setup_env_file
|
||||
|
||||
# Setup SSL certificates
|
||||
setup_ssl_certificates
|
||||
|
||||
# Show completion message
|
||||
show_next_steps
|
||||
}
|
||||
|
||||
# Run main function
|
||||
|
||||
@@ -1,26 +1,20 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Termix SSL Certificate Auto-Setup Script
|
||||
# Linus principle: Simple, automatic, works everywhere
|
||||
|
||||
set -e
|
||||
|
||||
# Configuration
|
||||
SSL_DIR="$(dirname "$0")/../ssl"
|
||||
CERT_FILE="$SSL_DIR/termix.crt"
|
||||
KEY_FILE="$SSL_DIR/termix.key"
|
||||
DAYS_VALID=365
|
||||
|
||||
# Default domain - can be overridden by environment variable
|
||||
DOMAIN=${SSL_DOMAIN:-"localhost"}
|
||||
ALT_NAMES=${SSL_ALT_NAMES:-"DNS:localhost,DNS:127.0.0.1,DNS:*.localhost,IP:127.0.0.1"}
|
||||
|
||||
# Colors for output
|
||||
RED='\033[0;31m'
|
||||
GREEN='\033[0;32m'
|
||||
YELLOW='\033[1;33m'
|
||||
BLUE='\033[0;34m'
|
||||
NC='\033[0m' # No Color
|
||||
NC='\033[0m'
|
||||
|
||||
log_info() {
|
||||
echo -e "${BLUE}[SSL Setup]${NC} $1"
|
||||
@@ -38,34 +32,26 @@ log_error() {
|
||||
echo -e "${RED}[SSL Setup]${NC} $1"
|
||||
}
|
||||
|
||||
# Check if certificate exists and is still valid
|
||||
check_existing_cert() {
|
||||
if [[ -f "$CERT_FILE" && -f "$KEY_FILE" ]]; then
|
||||
# Check if certificate is still valid for at least 30 days
|
||||
if openssl x509 -in "$CERT_FILE" -checkend 2592000 -noout 2>/dev/null; then
|
||||
log_success "✅ Valid SSL certificate already exists"
|
||||
log_info "Certificate: $CERT_FILE"
|
||||
log_info "Private Key: $KEY_FILE"
|
||||
log_success "Valid SSL certificate already exists"
|
||||
|
||||
# Show certificate info
|
||||
local expiry=$(openssl x509 -in "$CERT_FILE" -noout -enddate 2>/dev/null | cut -d= -f2)
|
||||
log_info "Expires: $expiry"
|
||||
return 0
|
||||
else
|
||||
log_warn "⚠️ Existing certificate is expired or expiring soon"
|
||||
log_warn "Existing certificate is expired or expiring soon"
|
||||
fi
|
||||
fi
|
||||
return 1
|
||||
}
|
||||
|
||||
# Generate self-signed certificate
|
||||
generate_certificate() {
|
||||
log_info "🔐 Generating new SSL certificate for domain: $DOMAIN"
|
||||
log_info "Generating new SSL certificate for domain: $DOMAIN"
|
||||
|
||||
# Create SSL directory if it doesn't exist
|
||||
mkdir -p "$SSL_DIR"
|
||||
|
||||
# Create OpenSSL config for SAN (Subject Alternative Names)
|
||||
local config_file="$SSL_DIR/openssl.conf"
|
||||
cat > "$config_file" << EOF
|
||||
[req]
|
||||
@@ -95,12 +81,11 @@ DNS.3 = *.localhost
|
||||
IP.1 = 127.0.0.1
|
||||
EOF
|
||||
|
||||
# Add custom alt names if provided
|
||||
if [[ -n "$SSL_ALT_NAMES" ]]; then
|
||||
local counter=2
|
||||
IFS=',' read -ra NAMES <<< "$SSL_ALT_NAMES"
|
||||
for name in "${NAMES[@]}"; do
|
||||
name=$(echo "$name" | xargs) # trim whitespace
|
||||
name=$(echo "$name" | xargs)
|
||||
if [[ "$name" == DNS:* ]]; then
|
||||
echo "DNS.$((counter++)) = ${name#DNS:}" >> "$config_file"
|
||||
elif [[ "$name" == IP:* ]]; then
|
||||
@@ -109,87 +94,28 @@ EOF
|
||||
done
|
||||
fi
|
||||
|
||||
# Generate private key
|
||||
log_info "📝 Generating private key..."
|
||||
log_info "Generating private key..."
|
||||
openssl genrsa -out "$KEY_FILE" 2048
|
||||
|
||||
# Generate certificate
|
||||
log_info "📄 Generating certificate..."
|
||||
log_info "Generating certificate..."
|
||||
openssl req -new -x509 -key "$KEY_FILE" -out "$CERT_FILE" -days $DAYS_VALID -config "$config_file" -extensions v3_req
|
||||
|
||||
# Set proper permissions
|
||||
chmod 600 "$KEY_FILE"
|
||||
chmod 644 "$CERT_FILE"
|
||||
|
||||
# Clean up temp config
|
||||
rm -f "$config_file"
|
||||
|
||||
log_success "✅ SSL certificate generated successfully"
|
||||
log_info "Certificate: $CERT_FILE"
|
||||
log_info "Private Key: $KEY_FILE"
|
||||
log_success "SSL certificate generated successfully"
|
||||
log_info "Valid for: $DAYS_VALID days"
|
||||
}
|
||||
|
||||
# Show certificate information
|
||||
show_certificate_info() {
|
||||
if [[ -f "$CERT_FILE" ]]; then
|
||||
echo ""
|
||||
log_info "📋 Certificate Information:"
|
||||
openssl x509 -in "$CERT_FILE" -noout -subject -issuer -dates
|
||||
|
||||
echo ""
|
||||
log_info "🌐 Subject Alternative Names:"
|
||||
openssl x509 -in "$CERT_FILE" -noout -text | grep -A1 "Subject Alternative Name" | tail -1 | sed 's/^[[:space:]]*//'
|
||||
fi
|
||||
}
|
||||
|
||||
# Main execution
|
||||
main() {
|
||||
echo ""
|
||||
echo "=============================================="
|
||||
echo "🔒 Termix SSL Certificate Auto-Setup"
|
||||
echo "=============================================="
|
||||
echo ""
|
||||
|
||||
log_info "Target domain: $DOMAIN"
|
||||
log_info "SSL directory: $SSL_DIR"
|
||||
|
||||
# Check if OpenSSL is available
|
||||
if ! command -v openssl &> /dev/null; then
|
||||
log_error "❌ OpenSSL is not installed. Please install OpenSSL first."
|
||||
log_error "OpenSSL is not installed. Please install OpenSSL first."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Check existing certificate
|
||||
if check_existing_cert; then
|
||||
show_certificate_info
|
||||
echo ""
|
||||
log_info "🚀 SSL setup complete - ready for HTTPS/WSS!"
|
||||
echo ""
|
||||
echo "To use the certificate:"
|
||||
echo " - Nginx SSL cert: $CERT_FILE"
|
||||
echo " - Nginx SSL key: $KEY_FILE"
|
||||
echo ""
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Generate new certificate
|
||||
generate_certificate
|
||||
show_certificate_info
|
||||
|
||||
echo ""
|
||||
log_success "🚀 SSL setup complete - ready for HTTPS/WSS!"
|
||||
echo ""
|
||||
echo "Next steps:"
|
||||
echo " 1. Update your Nginx configuration to use these certificates"
|
||||
echo " 2. Restart Nginx to enable HTTPS/WSS"
|
||||
echo " 3. Access your application via https://localhost"
|
||||
echo ""
|
||||
|
||||
# Security note for self-signed certificates
|
||||
log_warn "⚠️ Note: Self-signed certificates will show browser warnings"
|
||||
log_info "💡 For production, consider using Let's Encrypt or a commercial CA"
|
||||
}
|
||||
|
||||
# Run main function
|
||||
main "$@"
|
||||
Reference in New Issue
Block a user