aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-05-17 18:31:08 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-05-17 18:31:08 +0200
commitc75d655ef2f55fba3de5cdd0339f057941cb6666 (patch)
treec4e3f339e2e5c8c409fa453410be30a50e2b47df
parentf1f837804da4a2f9228e16339941c2f503e2678b (diff)
parent83341b3ca1ef7dbba1afaea41a722b43e50bdb5b (diff)
downloadPuppet-c75d655ef2f55fba3de5cdd0339f057941cb6666.tar.gz
Puppet-c75d655ef2f55fba3de5cdd0339f057941cb6666.tar.zst
Puppet-c75d655ef2f55fba3de5cdd0339f057941cb6666.zip
Merge branch 'dev'
-rw-r--r--modules/role/manifests/caldance.pp9
1 files changed, 9 insertions, 0 deletions
diff --git a/modules/role/manifests/caldance.pp b/modules/role/manifests/caldance.pp
index 5bc3912..1c87163 100644
--- a/modules/role/manifests/caldance.pp
+++ b/modules/role/manifests/caldance.pp
@@ -190,6 +190,11 @@ class role::caldance (
190 require => "all granted", 190 require => "all granted",
191 }, 191 },
192 { 192 {
193 path => "$home/media",
194 require => "all granted",
195 options => ["-Indexes"],
196 },
197 {
193 path => "/", 198 path => "/",
194 provider => "location", 199 provider => "location",
195 require => "valid-user", 200 require => "valid-user",
@@ -203,6 +208,10 @@ class role::caldance (
203 alias => "/static/", 208 alias => "/static/",
204 path => "$caldance_app/www/static/", 209 path => "$caldance_app/www/static/",
205 }, 210 },
211 {
212 alias => "/media/",
213 path => "$home/media/",
214 },
206 ], 215 ],
207 setenv => $apache_env, 216 setenv => $apache_env,
208 wsgi_script_aliases => { "/" => "$caldance_app/main_app/wsgi.py" }; 217 wsgi_script_aliases => { "/" => "$caldance_app/main_app/wsgi.py" };