From be1897bfb4144f4ec5e55a4a2847937eb748716d Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Thu, 2 Jul 2026 12:13:44 -0500
Subject: [PATCH 1/3] Revert "fix(nginx): remove /favicon.ico location block
 (#82)"

This reverts commit f7a4ff02609cd1a6b2897fbab30b67e22681873c.
---
 conf/nginx/templates/default.conf.template | 4 ++++
 conf/nginx/templates/sad.cms.conf.template | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/conf/nginx/templates/default.conf.template b/conf/nginx/templates/default.conf.template
index 1d7e992..70e7e8c 100644
--- a/conf/nginx/templates/default.conf.template
+++ b/conf/nginx/templates/default.conf.template
@@ -48,6 +48,10 @@ server {
         alias /var/www/robots.txt;
     }
 
+    location = /favicon.ico {
+        alias /var/www/portal/cms/static/site_cms/img/favicons/favicon.ico;
+    }
+
     location = /static/img/favicon.ico {
         alias /var/www/portal/cms/static/site_cms/img/favicons/favicon.ico;
     }
diff --git a/conf/nginx/templates/sad.cms.conf.template b/conf/nginx/templates/sad.cms.conf.template
index 3674827..7950aab 100644
--- a/conf/nginx/templates/sad.cms.conf.template
+++ b/conf/nginx/templates/sad.cms.conf.template
@@ -88,6 +88,10 @@ server {
         alias /var/www/portal/cms/static/site_cms/img/favicons/favicon.ico;
     }
 
+    location /favicon.ico {
+        alias /var/www/portal/cms/static/site_cms/img/favicons/favicon.ico;
+    }
+
     ## Include any custom location directives
     include /etc/nginx/conf.d/*.location.conf;
 }

From 6a16c122f8bf32d9f778f2c73b504512a06c211b Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Thu, 2 Jul 2026 09:44:08 -0700
Subject: [PATCH 2/3] fix(nginx): remove /favicon.ico location block (#82)

Lets /favicon.ico fall through to Django so the new CMS proxy view
can serve it. Required by TACC/Core-CMS#1190.
---
 conf/nginx/templates/default.conf.template | 4 ----
 conf/nginx/templates/sad.cms.conf.template | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/conf/nginx/templates/default.conf.template b/conf/nginx/templates/default.conf.template
index 70e7e8c..1d7e992 100644
--- a/conf/nginx/templates/default.conf.template
+++ b/conf/nginx/templates/default.conf.template
@@ -48,10 +48,6 @@ server {
         alias /var/www/robots.txt;
     }
 
-    location = /favicon.ico {
-        alias /var/www/portal/cms/static/site_cms/img/favicons/favicon.ico;
-    }
-
     location = /static/img/favicon.ico {
         alias /var/www/portal/cms/static/site_cms/img/favicons/favicon.ico;
     }
diff --git a/conf/nginx/templates/sad.cms.conf.template b/conf/nginx/templates/sad.cms.conf.template
index 7950aab..3674827 100644
--- a/conf/nginx/templates/sad.cms.conf.template
+++ b/conf/nginx/templates/sad.cms.conf.template
@@ -88,10 +88,6 @@ server {
         alias /var/www/portal/cms/static/site_cms/img/favicons/favicon.ico;
     }
 
-    location /favicon.ico {
-        alias /var/www/portal/cms/static/site_cms/img/favicons/favicon.ico;
-    }
-
     ## Include any custom location directives
     include /etc/nginx/conf.d/*.location.conf;
 }

From cbb941c2a54b4a39d4d145c949e1c71230a2d506 Mon Sep 17 00:00:00 2001
From: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Date: Thu, 2 Jul 2026 09:44:08 -0700
Subject: [PATCH 3/3] fix(nginx): remove /favicon.ico location block (#82)

Lets /favicon.ico fall through to Django so the new CMS proxy view
can serve it. Required by TACC/Core-CMS#1190.
---
 conf/nginx/templates/default.conf.template | 4 ----
 conf/nginx/templates/sad.cms.conf.template | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/conf/nginx/templates/default.conf.template b/conf/nginx/templates/default.conf.template
index 70e7e8c..1d7e992 100644
--- a/conf/nginx/templates/default.conf.template
+++ b/conf/nginx/templates/default.conf.template
@@ -48,10 +48,6 @@ server {
         alias /var/www/robots.txt;
     }
 
-    location = /favicon.ico {
-        alias /var/www/portal/cms/static/site_cms/img/favicons/favicon.ico;
-    }
-
     location = /static/img/favicon.ico {
         alias /var/www/portal/cms/static/site_cms/img/favicons/favicon.ico;
     }
diff --git a/conf/nginx/templates/sad.cms.conf.template b/conf/nginx/templates/sad.cms.conf.template
index 7950aab..3674827 100644
--- a/conf/nginx/templates/sad.cms.conf.template
+++ b/conf/nginx/templates/sad.cms.conf.template
@@ -88,10 +88,6 @@ server {
         alias /var/www/portal/cms/static/site_cms/img/favicons/favicon.ico;
     }
 
-    location /favicon.ico {
-        alias /var/www/portal/cms/static/site_cms/img/favicons/favicon.ico;
-    }
-
     ## Include any custom location directives
     include /etc/nginx/conf.d/*.location.conf;
 }