aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-06-08 01:02:41 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-06-08 01:02:41 +0200
commita9f3b9230bffa14a3bc2482de3b3d7fad37e0a08 (patch)
tree43a16ea6189235592368f0cd83f25f9534db8206
parent2365859e723337fff2cdb8e3db209655426825ad (diff)
parent6441f7dc8688f35ec926601d10d1d23359c186d3 (diff)
downloadPuppet-a9f3b9230bffa14a3bc2482de3b3d7fad37e0a08.tar.gz
Puppet-a9f3b9230bffa14a3bc2482de3b3d7fad37e0a08.tar.zst
Puppet-a9f3b9230bffa14a3bc2482de3b3d7fad37e0a08.zip
Merge branch 'dev'
-rw-r--r--modules/role/manifests/caldance.pp4
1 files changed, 1 insertions, 3 deletions
diff --git a/modules/role/manifests/caldance.pp b/modules/role/manifests/caldance.pp
index 1c87163..c99892e 100644
--- a/modules/role/manifests/caldance.pp
+++ b/modules/role/manifests/caldance.pp
@@ -40,9 +40,6 @@ class role::caldance (
40 "DEBUG" => "False", 40 "DEBUG" => "False",
41 "LOG_FILE" => "$home/caldev_django.log", 41 "LOG_FILE" => "$home/caldev_django.log",
42 "MEDIA_ROOT" => "$home/media", 42 "MEDIA_ROOT" => "$home/media",
43 "FROM_EMAIL" => $mail_from,
44 "EMAIL_HOST" => $smtp_host,
45 "EMAIL_PORT" => $smtp_port,
46 } 43 }
47 $shell_env = $environment.map |$key, $value| { "$key=$value" } 44 $shell_env = $environment.map |$key, $value| { "$key=$value" }
48 $apache_env = $environment.map |$key, $value| { "CALDANCE_$key $value" } 45 $apache_env = $environment.map |$key, $value| { "CALDANCE_$key $value" }
@@ -180,6 +177,7 @@ class role::caldance (
180 ssl_key => "/etc/letsencrypt/live/$web_host/privkey.pem", 177 ssl_key => "/etc/letsencrypt/live/$web_host/privkey.pem",
181 ssl_chain => "/etc/letsencrypt/live/$web_host/chain.pem", 178 ssl_chain => "/etc/letsencrypt/live/$web_host/chain.pem",
182 require => Letsencrypt::Certonly[$web_host], 179 require => Letsencrypt::Certonly[$web_host],
180 additional_includes => "$home/caldance_env",
183 directories => [ 181 directories => [
184 { 182 {
185 path => "$caldance_app/main_app", 183 path => "$caldance_app/main_app",