added /favicon.ico to web

gophr-pm · Nov 26, 2016 · 057f160 · 057f160
1 parent e0078da
commit 057f160
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/infra/docker/web/files/nginx.conf b/infra/docker/web/files/nginx.conf
@@ -51,6 +51,14 @@ http {
       access_log off;
     }
 
+    location = /favicon.ico {
+      expires 365d;
+      access_log off;
+      default_type image/x-icon;
+      add_header Cache-Control public;
+      alias /usr/share/nginx/html/favicon.ico;
+    }
+
     location ~ ^/static/ {
       rewrite ^/static/(.*) /$1 break;
     }

diff --git a/web/client/resources/images/favicon.ico b/web/client/resources/images/favicon.ico
diff --git a/web/webpack.config.js b/web/webpack.config.js
@@ -105,14 +105,24 @@ module.exports = {
       'resources',
       'images',
       'favicon.png')),
-    new CopyWebpackPlugin([{
-      from: path.join(
+    new CopyWebpackPlugin([
+      {
+        from: path.join(
         __dirname,
         'client',
         'resources',
         'images',
         'og-splash.png'),
-    }])
+      },
+      {
+        from: path.join(
+        __dirname,
+        'client',
+        'resources',
+        'images',
+        'favicon.ico'),
+      }
+    ])
   ],
   devServer: {
     contentBase: './client',