Merge branch 'dev'

[perso/Immae/Projets/Puppet.git] / modules / role / manifests / caldance.pp

diff --git a/modules/role/manifests/caldance.pp b/modules/role/manifests/caldance.pp
index f44455f4be1ea61797e75bf80ca68c222afd18ba..c99892eb27cfbf1029763ae3494521fcb8165f2e 100644 (file)
--- a/modules/role/manifests/caldance.pp
+++ b/modules/role/manifests/caldance.pp
@@ -39,9 +39,7 @@ class role::caldance (
     "SECRET_KEY"  => $secret_key,
     "DEBUG"       => "False",
     "LOG_FILE"    => "$home/caldev_django.log",
-    "FROM_EMAIL"  => $mail_from,
-    "EMAIL_HOST"  => $smtp_host,
-    "EMAIL_PORT"  => $smtp_port,
+    "MEDIA_ROOT"  => "$home/media",
   }
   $shell_env = $environment.map |$key, $value| { "$key=$value" }
   $apache_env = $environment.map |$key, $value| { "CALDANCE_$key   $value" }
@@ -61,6 +59,12 @@ class role::caldance (
     owner   => $user,
     group   => $group,
     require => User["$user:"],
+  } ->
+  file { "${home}/media":
+    ensure => "directory",
+    mode   => "0755",
+    owner  => "http",
+    group  => "http",
   }
 
   exec { "initialize_venv":
@@ -173,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",
@@ -182,6 +187,11 @@ class role::caldance (
         path    => "$caldance_app/www/static",
         require => "all granted",
       },
+      {
+        path    => "$home/media",
+        require => "all granted",
+        options => ["-Indexes"],
+      },
       {
         path           => "/",
         provider       => "location",
@@ -196,6 +206,10 @@ class role::caldance (
         alias => "/static/",
         path => "$caldance_app/www/static/",
       },
+      {
+        alias => "/media/",
+        path => "$home/media/",
+      },
     ],
     setenv              => $apache_env,
     wsgi_script_aliases => { "/" => "$caldance_app/main_app/wsgi.py" };