Skip to content

Commit acfb1ac

Browse files
committed
nginx vhost: exclude let's encrypt from rewrites
1 parent 333d13a commit acfb1ac

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

server/conf/nginx_vhost.conf.master

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,29 +46,29 @@ server {
4646
<tmpl_if name='ssl_enabled'>
4747
<tmpl_if name='rewrite_to_https' op='==' value='y'>
4848
if ($scheme != "https") {
49-
rewrite ^ https://$http_host$request_uri? permanent;
49+
rewrite ^(?!/\.well-known/acme-challenge)/ https://$http_host$request_uri? permanent;
5050
}
5151
</tmpl_if>
5252
</tmpl_if>
5353
<tmpl_if name='seo_redirect_enabled'>
5454
if ($http_host <tmpl_var name='seo_redirect_operator'> "<tmpl_var name='seo_redirect_origin_domain'>") {
55-
rewrite ^ $scheme://<tmpl_var name='seo_redirect_target_domain'>$request_uri? permanent;
55+
rewrite ^(?!/\.well-known/acme-challenge)/ $scheme://<tmpl_var name='seo_redirect_target_domain'>$request_uri? permanent;
5656
}
5757
</tmpl_if>
5858
<tmpl_loop name="alias_seo_redirects">
5959
if ($http_host <tmpl_var name='alias_seo_redirect_operator'> "<tmpl_var name='alias_seo_redirect_origin_domain'>") {
60-
rewrite ^ $scheme://<tmpl_var name='alias_seo_redirect_target_domain'>$request_uri? permanent;
60+
rewrite ^(?!/\.well-known/acme-challenge)/ $scheme://<tmpl_var name='alias_seo_redirect_target_domain'>$request_uri? permanent;
6161
}
6262
</tmpl_loop>
6363
<tmpl_loop name="local_redirects">
6464
if ($http_host <tmpl_var name='local_redirect_operator'> "<tmpl_var name='local_redirect_origin_domain'>") {
65-
rewrite ^<tmpl_var name='local_redirect_exclude'>(.*)$ <tmpl_var name='local_redirect_target'>$2 <tmpl_var name='local_redirect_type'>;
65+
rewrite ^<tmpl_var name='local_redirect_exclude'>(.*)$ <tmpl_var name='local_redirect_target'>$1 <tmpl_var name='local_redirect_type'>;
6666
}
6767
</tmpl_loop>
6868

6969
<tmpl_loop name="own_redirects">
7070
<tmpl_if name='use_rewrite'>
71-
<tmpl_if name='exclude_own_hostname'>if ($http_host != "<tmpl_var name='exclude_own_hostname'>") { </tmpl_if>rewrite ^<tmpl_var name='rewrite_exclude'>(.*)$ <tmpl_var name='rewrite_target'>$2 <tmpl_var name='rewrite_type'>;<tmpl_if name='exclude_own_hostname'> }</tmpl_if>
71+
<tmpl_if name='exclude_own_hostname'>if ($http_host != "<tmpl_var name='exclude_own_hostname'>") { </tmpl_if>rewrite ^<tmpl_var name='rewrite_exclude'>(.*)$ <tmpl_var name='rewrite_target'>$1 <tmpl_var name='rewrite_type'>;<tmpl_if name='exclude_own_hostname'> }</tmpl_if>
7272
</tmpl_if>
7373
<tmpl_if name='use_proxy'>
7474
location / {
@@ -364,7 +364,7 @@ server {
364364
<tmpl_if name='alias_seo_redirects2'>
365365
<tmpl_loop name="alias_seo_redirects2">
366366
if ($http_host <tmpl_var name='alias_seo_redirect_operator'> "<tmpl_var name='alias_seo_redirect_origin_domain'>") {
367-
rewrite ^ $scheme://<tmpl_var name='alias_seo_redirect_target_domain'>$request_uri? permanent;
367+
rewrite ^(?!/\.well-known/acme-challenge)/ $scheme://<tmpl_var name='alias_seo_redirect_target_domain'>$request_uri? permanent;
368368
}
369369
</tmpl_loop>
370370
</tmpl_if>

server/plugins-available/nginx_plugin.inc.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1484,7 +1484,7 @@ function update($event_name, $data) {
14841484
}
14851485
} else {
14861486
// external URL
1487-
$rewrite_exclude = '(.?)/';
1487+
$rewrite_exclude = '(?!\.well-known/acme-challenge)/';
14881488
if($data['new']['redirect_type'] == 'proxy'){
14891489
$vhost_data['use_proxy'] = 'y';
14901490
$rewrite_subdir = $tmp_redirect_path_parts['path'];
@@ -1536,7 +1536,7 @@ function update($event_name, $data) {
15361536
}
15371537
} else {
15381538
// external URL
1539-
$rewrite_exclude = '(.?)/';
1539+
$rewrite_exclude = '(?!\.well-known/acme-challenge)/';
15401540
if($data['new']['redirect_type'] == 'proxy'){
15411541
$vhost_data['use_proxy'] = 'y';
15421542
$rewrite_subdir = $tmp_redirect_path_parts['path'];
@@ -1586,7 +1586,7 @@ function update($event_name, $data) {
15861586
}
15871587
} else {
15881588
// external URL
1589-
$rewrite_exclude = '(.?)/';
1589+
$rewrite_exclude = '(?!\.well-known/acme-challenge)/';
15901590
if($data['new']['redirect_type'] == 'proxy'){
15911591
$vhost_data['use_proxy'] = 'y';
15921592
$rewrite_subdir = $tmp_redirect_path_parts['path'];

0 commit comments

Comments
 (0)