fixed e-mail configuration

fixed email message

Author: juanpablosalas

DMOps/file_invalidation_server/controllers/approval_message.yaml

@@ -11,8 +11,15 @@ spec:
           restartPolicy: OnFailure
           containers:
           - name: approval-message
-            image: registry.paas.cern.ch/file-invalidation-tool/file-invalidation-tool:latest
+            image: registry.paas.cern.ch/file-invalidation-tool/file-invalidation-tool:test
             command: ["python", "manage.py", "approval_message"]
+            env:
+            - name: EMAIL_HOST
+              value: cernmx.cern.ch
+            - name: EMAIL_PORT
+              value: "25"
+            - name: DEFAULT_FROM_EMAIL
+              value: file-invalidation-tool-noreply@cern.ch
             envFrom:
               - secretRef:
                   name: django-secret-key

DMOps/file_invalidation_server/fi_manager/management/commands/approval_message.py

@@ -24,10 +24,10 @@ def handle(self, *args, **kwargs):
         body_lines = []
         for request_id, items in grouped.items():
             user = items[0].request_user  # collect unique users
-            line = f"Request ID {request_id}: {len(items)} items waiting, submitted by {user}. Approve at: https://file-invalidation.app.cern.ch/api/approve/{r.request_id}"
+            line = f"\t-Request ID {request_id}\n\t\tFiles waiting approval:{len(items)}\n\t\tSubmitted by {user}\n\t\tApprove at: https://file-invalidation.app.cern.ch/api/approve/{request_id}"
             body_lines.append(line)
 
-        body = "\n".join(body_lines)
+        body = "\n\n".join(body_lines)
 
         # Send email
         send_mail(

DMOps/file_invalidation_server/file_invalidation_server/settings.py

@@ -12,6 +12,7 @@
 
 from pathlib import Path
 from decouple import config
+import os
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
@@ -64,7 +65,17 @@
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 ]
 
-DEFAULT_FROM_EMAIL = 'no-reply@file-invalidation-tool.cern.ch'
+EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
+
+EMAIL_HOST = os.getenv("EMAIL_HOST")
+EMAIL_PORT = int(os.getenv("EMAIL_PORT", "25"))
+DEFAULT_FROM_EMAIL = os.getenv("DEFAULT_FROM_EMAIL")
+
+EMAIL_HOST_USER = ""
+EMAIL_HOST_PASSWORD = ""
+
+EMAIL_USE_TLS = False
+EMAIL_USE_SSL = False
 ADMIN_EMAIL = 'juan.pablo.salas.galindo@cern.ch'
 
 ROOT_URLCONF = 'file_invalidation_server.urls'