From 49229af7ce00b59bd41081418c9c06f34ab6d7b8 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Fri, 02 Nov 2012 16:52:03 -0400
Subject: [PATCH] - I'm rewriting the way nginx handles rewrites/redirects. WORK IN PROGRESS!
---
server/conf/nginx_vhost.conf.master | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/server/conf/nginx_vhost.conf.master b/server/conf/nginx_vhost.conf.master
index 86f3cdb..254c9f8 100644
--- a/server/conf/nginx_vhost.conf.master
+++ b/server/conf/nginx_vhost.conf.master
@@ -22,14 +22,22 @@
rewrite ^ $scheme://<tmpl_var name='seo_redirect_target_domain'>$request_uri? permanent;
}
</tmpl_if>
-
-<tmpl_loop name="redirects">
- if ($http_host ~* "<tmpl_var name='rewrite_domain'>$") {
+
+<tmpl_loop name="own_redirects">
+<tmpl_if name='use_rewrite'>
+ #if ($http_host ~* "<tmpl_var name='rewrite_domain'>$") {
#rewrite ^/(.+)$ <tmpl_var name='rewrite_target'>$1 <tmpl_var name='rewrite_type'>;
rewrite ^<tmpl_var name='rewrite_exclude'>/(.+)$ <tmpl_var name='rewrite_target'>$2 <tmpl_var name='rewrite_type'>;
+ #rewrite ^ <tmpl_var name='rewrite_target'>$request_uri? <tmpl_var name='rewrite_type'>;
+ #}
+</tmpl_if>
+<tmpl_if name='use_internal'>
+ location / {
+ proxy_pass <tmpl_var name='rewrite_target'>;
}
+</tmpl_if>
</tmpl_loop>
-
+<tmpl_if name='use_internal' op='!=' value='y'>
index index.html index.htm index.php index.cgi index.pl index.xhtml;
<tmpl_if name='ssi' op='==' value='y'>
@@ -157,5 +165,33 @@
}
}
</tmpl_loop>
-
-}
\ No newline at end of file
+</tmpl_if>
+}
+
+<tmpl_loop name="redirects">
+server {
+ listen <tmpl_var name='ip_address'>:80;
+<tmpl_if name='ipv6_enabled'>
+ listen [<tmpl_var name='ipv6_address'>]:80;
+</tmpl_if>
+
+<tmpl_if name='ssl_enabled'>
+ listen <tmpl_var name='ip_address'>:443 ssl;
+<tmpl_if name='ipv6_enabled'>
+ listen [<tmpl_var name='ipv6_address'>]:443 ssl;
+</tmpl_if>
+ ssl_certificate <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.crt;
+ ssl_certificate_key <tmpl_var name='document_root'>/ssl/<tmpl_var name='ssl_domain'>.key;
+</tmpl_if>
+
+ server_name <tmpl_var name='rewrite_domain'>;
+ location / {
+<tmpl_if name='use_rewrite'>
+ rewrite ^ <tmpl_var name='rewrite_target'>$request_uri? <tmpl_var name='rewrite_type'>;
+</tmpl_if>
+<tmpl_if name='use_internal'>
+ proxy_pass <tmpl_var name='rewrite_target'>;
+</tmpl_if>
+ }
+}
+</tmpl_loop>
\ No newline at end of file
--
Gitblit v1.9.1