Add arbitrary environments to caldance

diff --git a/modules/role/manifests/caldance.pp b/modules/role/manifests/caldance.pp
index 1c87163c90b43bc2064f2eed0ad4fee0f58d1809..c99892eb27cfbf1029763ae3494521fcb8165f2e 100644 (file)
--- a/modules/role/manifests/caldance.pp
+++ b/modules/role/manifests/caldance.pp
@@ -40,9 +40,6 @@ class role::caldance (
     "DEBUG"       => "False",
     "LOG_FILE"    => "$home/caldev_django.log",
     "MEDIA_ROOT"  => "$home/media",
-    "FROM_EMAIL"  => $mail_from,
-    "EMAIL_HOST"  => $smtp_host,
-    "EMAIL_PORT"  => $smtp_port,
   }
   $shell_env = $environment.map |$key, $value| { "$key=$value" }
   $apache_env = $environment.map |$key, $value| { "CALDANCE_$key   $value" }
@@ -180,6 +177,7 @@ class role::caldance (
     ssl_key             => "/etc/letsencrypt/live/$web_host/privkey.pem",
     ssl_chain           => "/etc/letsencrypt/live/$web_host/chain.pem",
     require             => Letsencrypt::Certonly[$web_host],
+    additional_includes => "$home/caldance_env",
     directories         => [
       {
         path    => "$caldance_app/main_app",