redirecting noao to noirlab.edu

NOAO · Apr 29, 2021 · f175e70 · f175e70
1 parent 6f58d53
commit f175e70
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/files/nginx.conf b/files/nginx.conf
@@ -58,9 +58,9 @@ http {
   # gzip_vary on;
   # gzip_proxied any;
   # gzip_comp_level 6;
-  # gzip_buffers 16 8k;
-  # gzip_http_version 1.1;
-  # gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
+  gzip_buffers 16 8k;
+  gzip_http_version 1.1;
+  gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
 
   ##
   # Virtual Host Configs

diff --git a/files/nginx/nginx.conf b/files/nginx/nginx.conf
@@ -61,10 +61,10 @@ http {
 
   # gzip_vary on;
   # gzip_proxied any;
-  # gzip_comp_level 6;
-  # gzip_buffers 16 8k;
+  gzip_comp_level 6;
+  gzip_buffers 16 8k;
   # gzip_http_version 1.1;
-  # gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
+  gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
 
   ##
   # Virtual Host Configs

diff --git a/files/nginx/sites-enabled/noirlab b/files/nginx/sites-enabled/noirlab
@@ -44,11 +44,14 @@ server {
 
     # Django media
     location /media  {
-        alias /opt/mars/marssite/static;  # your Django project's media files - amend as required
+        alias /opt/mars/marssite/static/;  # your Django project's media files - amend as required
     }
 
     location /static {
-        alias /opt/mars/marssite/static; # your Django project's static files - amend as required
+        expires 10d;
+        sendfile on;
+        sendfile_max_chunk 1m;
+        alias /opt/mars/marssite/static/; # your Django project's static files - amend as required
     }
 
     location /download/zip {

diff --git a/files/nginx/sites-enabled/prod.default b/files/nginx/sites-enabled/prod.default
@@ -9,10 +9,10 @@ upstream app_server {
   server unix:/opt/mars/gunicorn.sock fail_timeout=0;
 }
 server {
-    listen 80 default_server;
-    listen [::]:80 default_server;
+    listen 80;
+    listen [::]:80;
     server_name astroarchive.noao.edu;
-    return 301 https://$host$request_uri;
+    return 301 https://astroarchive.noirlab.edu; #https://$host$request_uri;
 }
 
 # configuration of the server
@@ -37,6 +37,8 @@ server {
     #server_name .dm.noao.edu; # substitute your machine's IP address or FQDN
     charset     utf-8;
 
+    # Redirect
+    return 301 https://astroarchive.noirlab.edu;
 
     # max upload size
     client_max_body_size 75M;   # adjust to taste