X-Git-Url: https://git.cyclocoop.org/?p=lhc%2Fateliers.git;a=blobdiff_plain;f=etc%2Fnginx%2Fsite.d%2Flhc-questionnaires%2Fsite.conf;h=652770569dd90b650e21e6834253584f6afba960;hp=021fc82a5a016955c3c449d5dccd7f683812bfc2;hb=9b4758b162a1037a8f598c91c0d05e77d98d0bbb;hpb=c2a3474d49db5a69b30a51fe98f324ad82b036c3

diff --git a/etc/nginx/site.d/lhc-questionnaires/site.conf b/etc/nginx/site.d/lhc-questionnaires/site.conf
index 021fc82..6527705 100644
--- a/etc/nginx/site.d/lhc-questionnaires/site.conf
+++ b/etc/nginx/site.d/lhc-questionnaires/site.conf
@@ -1,10 +1,16 @@
-server_name questionnaires.heureux-cyclage.org formations.heureux-cyclage.org;
+server_name
+ questionnaires.heureux-cyclage.org
+ formations.heureux-cyclage.org
+ rencontres.heureux-cyclage.org;
 
 client_body_buffer_size 8k;
 client_max_body_size 10m;
 location / {
 	if ($host = "formations.heureux-cyclage.org") {
-		return 302 "$scheme://questionnaires.heureux-cyclage.org/index.php?r=survey/index/sid/533927/lang/fr";
+		return 302 "$scheme://questionnaires.heureux-cyclage.org/index.php?r=survey/index&sid=367568";
+	 }
+	if ($host = "rencontres.heureux-cyclage.org") {
+		return 302 "$scheme://questionnaires.heureux-cyclage.org/index.php?r=survey/index&sid=462499";
 	 }
 	index index.html index.htm index.php;
  }
@@ -20,31 +26,11 @@ location ~ /\. {
  }
 location ~ \.php$ {
 	include /etc/nginx/conf.d/fastcgi.conf;
-	set $no_cache "0";
-	if ($args = "r=admin/survey/sa/view/surveyid/933958") {
-		return 403;
-	}
-	if ($args = "r=admin/survey/sa/view/surveyid/933958") {
-		return 403;
-	}
-	if ($args = "r=survey/index/sid/933958/lang/fr") {
-		return 403;
-	}
-	if ($args = "r=survey/index/sid/933958/lang/en") {
-		return 403;
-	}
-	if ($args = "r=survey/index/sid/933958/lang/es") {
+	set $deny "${lhc_questionnaires_ptitvelo_url_blacklist}${lhc_questionnaires_ptitvelo_ip_whitelist}";
+	if ($deny = "10") {
 		return 403;
-	}
-	if ($args = "r=survey/index/sid/933958/lang/it-informal") {
-		return 403;
-	}
-	if ($args = "r=survey/index/sid/933958/") {
-		return 403;
-	}
-	if ($args = "r=survey/index/sid/933958/newtest/Y") {
-		return 403;
-}
+	 }
+	set $no_cache "0";
 	if ($request_method !~ ^(GET|HEAD)$) {
 	 # NOTE: if non GET/HEAD, don't cache and mark user as uncacheable for 1 second via cookie.
 		set $no_cache "1";