diff --git a/salt/common/nginx/nginx.conf.so-eval b/salt/common/nginx/nginx.conf.so-eval index f0f03bac2..fcd3ee8af 100644 --- a/salt/common/nginx/nginx.conf.so-eval +++ b/salt/common/nginx/nginx.conf.so-eval @@ -134,9 +134,9 @@ http { proxy_set_header Connection "Upgrade"; } - location /auth/ { + location ~ ^/auth/.*?(whoami|login|logout) { rewrite /auth/(.*) /$1 break; - proxy_pass http://{{ masterip }}:4433/; + proxy_pass http://{{ masterip }}:4433; proxy_read_timeout 90; proxy_connect_timeout 90; proxy_set_header Host $host; diff --git a/salt/common/nginx/nginx.conf.so-master b/salt/common/nginx/nginx.conf.so-master index f0f03bac2..fcd3ee8af 100644 --- a/salt/common/nginx/nginx.conf.so-master +++ b/salt/common/nginx/nginx.conf.so-master @@ -134,9 +134,9 @@ http { proxy_set_header Connection "Upgrade"; } - location /auth/ { + location ~ ^/auth/.*?(whoami|login|logout) { rewrite /auth/(.*) /$1 break; - proxy_pass http://{{ masterip }}:4433/; + proxy_pass http://{{ masterip }}:4433; proxy_read_timeout 90; proxy_connect_timeout 90; proxy_set_header Host $host; diff --git a/salt/common/nginx/nginx.conf.so-mastersearch b/salt/common/nginx/nginx.conf.so-mastersearch index f0f03bac2..fcd3ee8af 100644 --- a/salt/common/nginx/nginx.conf.so-mastersearch +++ b/salt/common/nginx/nginx.conf.so-mastersearch @@ -134,9 +134,9 @@ http { proxy_set_header Connection "Upgrade"; } - location /auth/ { + location ~ ^/auth/.*?(whoami|login|logout) { rewrite /auth/(.*) /$1 break; - proxy_pass http://{{ masterip }}:4433/; + proxy_pass http://{{ masterip }}:4433; proxy_read_timeout 90; proxy_connect_timeout 90; proxy_set_header Host $host; diff --git a/salt/soc/files/kratos/schema.json b/salt/soc/files/kratos/schema.json index 28e630a8f..4e0d7ac02 100644 --- a/salt/soc/files/kratos/schema.json +++ b/salt/soc/files/kratos/schema.json @@ -18,6 +18,18 @@ "verification": { "via": "email" } + }, + "firstName": { + "type": "string", + "title": "First Name" + }, + "lastName": { + "type": "string", + "title": "Last Name" + }, + "role": { + "type": "string", + "title": "Role" } } },