summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux/nginx/etc/nginx/conf.d/cleberg.net.conf6
-rw-r--r--linux/nginx/etc/nginx/conf.d/cleberg.net_wildcard.conf3
2 files changed, 3 insertions, 6 deletions
diff --git a/linux/nginx/etc/nginx/conf.d/cleberg.net.conf b/linux/nginx/etc/nginx/conf.d/cleberg.net.conf
index 517e64c..13020ce 100644
--- a/linux/nginx/etc/nginx/conf.d/cleberg.net.conf
+++ b/linux/nginx/etc/nginx/conf.d/cleberg.net.conf
@@ -43,12 +43,6 @@ server {
}
server {
- listen 80;
- server_name www.cleberg.net cleberg.net;
- return 301 https://cleberg.net$request_uri;
-}
-
-server {
listen 443 ssl;
http2 on;
server_name hutch.cleberg.net;
diff --git a/linux/nginx/etc/nginx/conf.d/cleberg.net_wildcard.conf b/linux/nginx/etc/nginx/conf.d/cleberg.net_wildcard.conf
index 5160d29..062318b 100644
--- a/linux/nginx/etc/nginx/conf.d/cleberg.net_wildcard.conf
+++ b/linux/nginx/etc/nginx/conf.d/cleberg.net_wildcard.conf
@@ -1,5 +1,8 @@
server {
listen 80;
server_name .cleberg.net;
+ if ($host = www.cleberg.net) {
+ return 301 https://cleberg.net$request_uri;
+ }
return 301 https://$host$request_uri;
}