upd: fix http-challenge

Change-Id: I5d07b6f25e314444893dc3dd5c31a41c3c74a834

diff --git a/bootstrap-user b/bootstrap-user
index 6241432b11016107037c8044e26037353a8066df..dc6079cb26edf79140051fcc2fd8102ac034dfa9 100644 (file)
--- a/bootstrap-user
+++ b/bootstrap-user
@@ -161,7 +161,7 @@ fi
 csrf=$(mcurl "account/domains/$domain" | tee $folder/domain | csrf "tail -n 1")
 
 token=$(grep pre $folder/domain | tail -n 1 | sed "s_.*>\([a-zA-Z0-9]*\)<.*_\1_")
-name=$(grep "content available under" $folder/domain | sed "s_.*/\([a-zA-Z0-9]*\)\\.txt.*_\1_")
+name=$(grep "content available at" $folder/domain | sed "s_.*/\([a-zA-Z0-9]*\)\\.txt.*_\1_")
 
 sudo mkdir -p /data/nginx/challenge/.well-known/someca-challenge
 printf "%s" "$token" | sudo tee /data/nginx/challenge/.well-known/someca-challenge/$name.txt > /dev/null

diff --git a/modules/gigi/templates/nginx.epp b/modules/gigi/templates/nginx.epp
index e6c8237dc596a03ac56999ddb2b37aedf9779ee5..a6ec4254c8fde36e92282481b74c34051eac286a 100644 (file)
--- a/modules/gigi/templates/nginx.epp
+++ b/modules/gigi/templates/nginx.epp
@@ -36,7 +36,7 @@ server {
         auth_basic_user_file /etc/nginx/access.txt;
         <% } %>
     }
-    location ~* /cacert-.* {
+    location ~* /.well-known/someca-challenge/* {
         root /data/challenge;
     }
 }
@@ -57,7 +57,7 @@ server {
         auth_basic_user_file /etc/nginx/access.txt;
         <% } %>
     }
-    location ~* /cacert-.* {
+    location ~* /.well-known/someca-challenge/.* {
         root /data/challenge;
     }
 }