gistfile1.txt

  1 
  2 # this file holds configs that apply to all sites and should be included in
  3 # html context for nginx configs
  4 
  5 # GeoIP database to be used ... this can't go in a server clause
  6 geoip_city /usr/share/GeoIP/GeoLiteCity.dat;
  7 <<<<<<< HEAD
  8 =======
  9 
 10 
 11 # Hardcoded redirect for support.globus.org -> support.globusonline.org
 12 # in preparation for transitioning to globus.org domain. Replace this when
 13 # we're done with the changeover. -BJM 2013-11-08
 14 server {
 15   listen 80;
 16   listen 443 ssl;
 17   resolver 8.8.8.8;
 18   server_name support.globusonline.org;
 19   rewrite ^ https://support.globus.org$request_uri? permanent;
 20   ssl_certificate      /etc/ssl/server.crt;
 21   ssl_certificate_key  /etc/ssl/server.key;
 22 }
 23 >>>>>>> 7311a50... Real redirect, support.globusonline.org -> support.globus.org