From 459e12d0a5dc1984ae9642f6aa453f371d2d161f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Wed, 8 May 2019 13:23:24 +0200
Subject: Add media directory for caldance

---
 modules/role/manifests/caldance.pp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/modules/role/manifests/caldance.pp b/modules/role/manifests/caldance.pp
index f44455f..2794e00 100644
--- a/modules/role/manifests/caldance.pp
+++ b/modules/role/manifests/caldance.pp
@@ -61,6 +61,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":
@@ -107,6 +113,14 @@ class role::caldance (
     require     => [User["$user:"], File["$caldance_app/manage.py"]],
     refreshonly => true,
   } ~>
+  exec { "py-symlink-file":
+    cwd         => $caldance_app,
+    user        => $user,
+    environment => concat(["HOME=${home}"], $shell_env),
+    command     => "/usr/bin/ln -sf ${home}/media www/media",
+    require     => [User["$user:"], File["$caldance_app/manage.py"]],
+    refreshonly => true,
+  } ~>
   exec { "reload httpd":
     command     => "/usr/bin/systemctl reload httpd",
     require     => [User["$user:"], File["$caldance_app/manage.py"]],
-- 
cgit v1.2.3


From 3f485c9ecf9c39bda1699675f5bb94d2ed2e0071 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Wed, 8 May 2019 13:37:22 +0200
Subject: Add media root environment file

---
 modules/role/manifests/caldance.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/role/manifests/caldance.pp b/modules/role/manifests/caldance.pp
index 2794e00..7f17c10 100644
--- a/modules/role/manifests/caldance.pp
+++ b/modules/role/manifests/caldance.pp
@@ -39,6 +39,7 @@ class role::caldance (
     "SECRET_KEY"  => $secret_key,
     "DEBUG"       => "False",
     "LOG_FILE"    => "$home/caldev_django.log",
+    "MEDIA_ROOT"  => "$home/media",
     "FROM_EMAIL"  => $mail_from,
     "EMAIL_HOST"  => $smtp_host,
     "EMAIL_PORT"  => $smtp_port,
-- 
cgit v1.2.3


From 83694da6825dfc14c7003a4074c668ca6d9eddfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Mon, 13 May 2019 16:44:43 +0200
Subject: Revert symlink creation for caldance

---
 modules/role/manifests/caldance.pp | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/modules/role/manifests/caldance.pp b/modules/role/manifests/caldance.pp
index 7f17c10..5bc3912 100644
--- a/modules/role/manifests/caldance.pp
+++ b/modules/role/manifests/caldance.pp
@@ -114,14 +114,6 @@ class role::caldance (
     require     => [User["$user:"], File["$caldance_app/manage.py"]],
     refreshonly => true,
   } ~>
-  exec { "py-symlink-file":
-    cwd         => $caldance_app,
-    user        => $user,
-    environment => concat(["HOME=${home}"], $shell_env),
-    command     => "/usr/bin/ln -sf ${home}/media www/media",
-    require     => [User["$user:"], File["$caldance_app/manage.py"]],
-    refreshonly => true,
-  } ~>
   exec { "reload httpd":
     command     => "/usr/bin/systemctl reload httpd",
     require     => [User["$user:"], File["$caldance_app/manage.py"]],
-- 
cgit v1.2.3