From 599113768dfe7528178a6dda7877a79290f50fde Mon Sep 17 00:00:00 2001
From: Denis Nutiu <dnutiu@nuculabs.dev>
Date: Sun, 23 Feb 2025 00:26:57 +0200
Subject: [PATCH] fix mail for baikal

---
 sabre-dav/.idea/misc.xml                          |  2 +-
 sabre-dav/.idea/sabre-dav.iml                     |  9 +--------
 sabre-dav/playbook.yaml                           |  5 +++++
 sabre-dav/templates/container/baikal.container.j2 | 12 +++++++++++-
 sabre-dav/templates/container/environment_file    | 13 +++++++++++++
 sabre-dav/variables.yaml                          | 13 +------------
 6 files changed, 32 insertions(+), 22 deletions(-)
 create mode 100644 sabre-dav/templates/container/environment_file

diff --git a/sabre-dav/.idea/misc.xml b/sabre-dav/.idea/misc.xml
index f1ed6f5..a893780 100644
--- a/sabre-dav/.idea/misc.xml
+++ b/sabre-dav/.idea/misc.xml
@@ -3,5 +3,5 @@
   <component name="Black">
     <option name="sdkName" value="Python 3.13 (sabre-dav)" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.13 (sabre-dav)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.13" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file
diff --git a/sabre-dav/.idea/sabre-dav.iml b/sabre-dav/.idea/sabre-dav.iml
index e43d4d2..b8245c2 100644
--- a/sabre-dav/.idea/sabre-dav.iml
+++ b/sabre-dav/.idea/sabre-dav.iml
@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.venv" />
-    </content>
-    <orderEntry type="jdk" jdkName="Python 3.13 (sabre-dav)" jdkType="Python SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
+<module version="4">
   <component name="TemplatesService">
     <option name="TEMPLATE_FOLDERS">
       <list>
diff --git a/sabre-dav/playbook.yaml b/sabre-dav/playbook.yaml
index fe8e1ce..e7c09a8 100644
--- a/sabre-dav/playbook.yaml
+++ b/sabre-dav/playbook.yaml
@@ -41,6 +41,11 @@
             src: ./templates/container/baikal.container.j2
             dest: /etc/containers/systemd/baikal.container
             mode: "0644"
+        - name: "Copy environment file"
+          ansible.builtin.template:
+            src: ./templates/container/environment_file
+            dest: "{{ baikal.base_directory }}/environment_file"
+            mode: "0644"
         - name: Reload systemd
           ansible.builtin.command:
             cmd: systemctl daemon-reload
diff --git a/sabre-dav/templates/container/baikal.container.j2 b/sabre-dav/templates/container/baikal.container.j2
index a39a77c..1fb2689 100644
--- a/sabre-dav/templates/container/baikal.container.j2
+++ b/sabre-dav/templates/container/baikal.container.j2
@@ -7,7 +7,17 @@ AutoUpdate=registry
 PublishPort={{ baikal.port }}:80/tcp
 Volume={{ baikal.base_directory }}/{{ baikal.data_directory }}:/var/www/baikal/Specific:Z
 Volume={{ baikal.base_directory }}/{{ baikal.config_directory }}:/var/www/baikal/config:Z
-Environment=MSMTPRC={{ baikal.mail }}
+Environment="MSMTPRC=defaults\n\
+auth           on\n\
+tls            on\n\
+tls_trust_file /etc/ssl/certs/ca-certificates.crt\n\
+account        default\n\
+host           host\n\
+port           587\n\
+from           baikal@example.com\n\
+user           user\n\
+password       pass\n\
+"
 
 [Service]
 # Inform systemd of additional exit status
diff --git a/sabre-dav/templates/container/environment_file b/sabre-dav/templates/container/environment_file
new file mode 100644
index 0000000..1112df7
--- /dev/null
+++ b/sabre-dav/templates/container/environment_file
@@ -0,0 +1,13 @@
+MSMTPRC="
+defaults
+auth           on
+tls            on
+tls_trust_file /etc/ssl/certs/ca-certificates.crt
+account        default
+host           <smtp host>
+port           587
+from           baikal@example.com
+user           <user>
+password       <password>
+"
+
diff --git a/sabre-dav/variables.yaml b/sabre-dav/variables.yaml
index 00fbfb0..a67f0e2 100644
--- a/sabre-dav/variables.yaml
+++ b/sabre-dav/variables.yaml
@@ -4,15 +4,4 @@ baikal:
   port: 8069
   base_directory: "/baikal"
   data_directory: "data"
-  config_directory: "config"
-  mail: "" # note you will need to inline the following variables
-#    defaults
-#    auth           on
-#    tls            on
-#    tls_trust_file /etc/ssl/certs/ca-certificates.crt
-#    account        default
-#    host           <smtp host>
-#    port           587
-#    from           baikal@example.com
-#    user           <user>
-#    password       <password>
\ No newline at end of file
+  config_directory: "config"
\ No newline at end of file