diff --git a/config/ssl.conf b/config/ssl.conf index f21ca78..7b95607 100644 --- a/config/ssl.conf +++ b/config/ssl.conf @@ -2,18 +2,14 @@ distinguished_name = req_distinguished_name req_extensions = req_ext x509_extensions = req_ext +prompt = no [req_distinguished_name] countryName = FR -countryName_default = FR stateOrProvinceName = Pyrénées Orientales -stateOrProvinceName_default = Pyrénées Orientales localityName = Perpignan -localityName_default = Perpignan organizationName = 42Perpignan -organizationName_default = 42Perpignan commonName = www.ft_transcendence.com -commonName_default = localhost [req_ext] subjectAltName = @alt_names diff --git a/makefile b/makefile index 34554b5..5ada811 100644 --- a/makefile +++ b/makefile @@ -9,7 +9,13 @@ ELK_COMPOSE=docker compose -f $(ELK_COMPOSE_FILE) -p $(ELK_PROJECT_NAME) CONTAINER=$(c) -up: down + +# Define a red color variable using ANSI escape code +RED=\033[31m +GREEN=\033[32m +NC=\033[0m # No Color (reset) + +up: down ssl-certs $(COMPOSE) build $(COMPOSE) up -d $(CONTAINER) || true @@ -23,9 +29,15 @@ destroy: $(COMPOSE) down -v --rmi all ssl-certs: - openssl req -x509 -nodes -days 365 -newkey rsa:4096 \ - -keyout certs/ssl/private.key -out certs/ssl/certificate.crt \ - -config config/ssl.conf + @if [ ! -f certs/ssl/private.key ] && [ ! -f certs/ssl/certificate.crt ]; then \ + echo "$(GREEN)SSL certificates not found, generating...$(NC)"; \ + mkdir -p certs/ssl; \ + openssl req -x509 -nodes -days 365 -newkey rsa:4096 \ + -keyout certs/ssl/private.key -out certs/ssl/certificate.crt \ + -config config/ssl.conf; \ + else \ + echo "$(GREEN)SSL certificates already exist.$(NC)"; \ + fi # Manage ELK stack