Move spoofed-favicon static files to domain-agnostic path.

chromium · Apr 21, 2017 · 8fa8a4e · 8fa8a4e
1 parent 84944e3
commit 8fa8a4e
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 8 deletions.
diff --git a/domains/ui/spoofed-favicon.badssl.com.conf → domains/ui/spoofed-favicon.conf b/domains/ui/spoofed-favicon.badssl.com.conf → domains/ui/spoofed-favicon.conf
@@ -10,26 +10,26 @@ map $http_user_agent $agent {
 
 server {
   listen 80;
-  server_name spoofed-favicon.badssl.com;
+  server_name spoofed-favicon.{{ site.domain }};
 
   include {{ site.serving-path }}/common/common.conf;
 
-  location /favicons/favicon.ico { alias {{ site.serving-path }}/domains/ui/spoofed-favicon.badssl.com/favicons/favicon-$agent.ico; }
-  location /favicons/icon.png    { alias {{ site.serving-path }}/domains/ui/spoofed-favicon.badssl.com/favicons/icon-$agent.png; }
+  location /favicons/favicon.ico { alias {{ site.serving-path }}/domains/ui/spoofed-favicon/favicons/favicon-$agent.ico; }
+  location /favicons/icon.png    { alias {{ site.serving-path }}/domains/ui/spoofed-favicon/favicons/icon-$agent.png; }
 
-  root {{ site.serving-path }}/domains/ui/spoofed-favicon.badssl.com;
+  root {{ site.serving-path }}/domains/ui/spoofed-favicon;
 }
 
 server {
   listen 443;
-  server_name spoofed-favicon.badssl.com;
+  server_name spoofed-favicon.{{ site.domain }};
 
   include {{ site.serving-path }}/common/common.conf;
   include {{ site.serving-path }}/nginx-includes/wildcard-normal.conf;
   include {{ site.serving-path }}/nginx-includes/tls-defaults.conf;
 
-  location /favicons/favicon.ico { alias {{ site.serving-path }}/domains/ui/spoofed-favicon.badssl.com/favicons/favicon-$agent.ico; }
-  location /favicons/icon.png    { alias {{ site.serving-path }}/domains/ui/spoofed-favicon.badssl.com/favicons/icon-$agent.png; }
+  location /favicons/favicon.ico { alias {{ site.serving-path }}/domains/ui/spoofed-favicon/favicons/favicon-$agent.ico; }
+  location /favicons/icon.png    { alias {{ site.serving-path }}/domains/ui/spoofed-favicon/favicons/icon-$agent.png; }
 
-  root {{ site.serving-path }}/domains/misc/spoofed-favicon.badssl.com;
+  root {{ site.serving-path }}/domains/misc/spoofed-favicon;
 }
diff --git a/...sl.com/favicons/favicon-chrome-mobile.ico → ...avicon/favicons/favicon-chrome-mobile.ico b/...sl.com/favicons/favicon-chrome-mobile.ico → ...avicon/favicons/favicon-chrome-mobile.ico
diff --git a/...on.badssl.com/favicons/favicon-chrome.ico → ...oofed-favicon/favicons/favicon-chrome.ico b/...on.badssl.com/favicons/favicon-chrome.ico → ...oofed-favicon/favicons/favicon-chrome.ico
diff --git a/...on.badssl.com/favicons/favicon-fennec.ico → ...oofed-favicon/favicons/favicon-fennec.ico b/...on.badssl.com/favicons/favicon-fennec.ico → ...oofed-favicon/favicons/favicon-fennec.ico
diff --git a/...n.badssl.com/favicons/favicon-firefox.ico → ...ofed-favicon/favicons/favicon-firefox.ico b/...n.badssl.com/favicons/favicon-firefox.ico → ...ofed-favicon/favicons/favicon-firefox.ico
diff --git a/...adssl.com/favicons/icon-chrome-mobile.png → ...d-favicon/favicons/icon-chrome-mobile.png b/...adssl.com/favicons/icon-chrome-mobile.png → ...d-favicon/favicons/icon-chrome-mobile.png
diff --git a/...vicon.badssl.com/favicons/icon-chrome.png → .../spoofed-favicon/favicons/icon-chrome.png b/...vicon.badssl.com/favicons/icon-chrome.png → .../spoofed-favicon/favicons/icon-chrome.png
diff --git a/...vicon.badssl.com/favicons/icon-fennec.png → .../spoofed-favicon/favicons/icon-fennec.png b/...vicon.badssl.com/favicons/icon-fennec.png → .../spoofed-favicon/favicons/icon-fennec.png
diff --git a/...icon.badssl.com/favicons/icon-firefox.png → ...spoofed-favicon/favicons/icon-firefox.png b/...icon.badssl.com/favicons/icon-firefox.png → ...spoofed-favicon/favicons/icon-firefox.png
diff --git a/.../ui/spoofed-favicon.badssl.com/index.html → domains/ui/spoofed-favicon/index.html b/.../ui/spoofed-favicon.badssl.com/index.html → domains/ui/spoofed-favicon/index.html