CLI fixes for PORT and IP/HOST

Makefile

@@ -125,6 +125,7 @@ frontend-build:
 	cd frontend && yarn && yarn build
 	cp -r frontend/dist source/ && cp -r frontend/src/assets/scss source/dist/
 	cp -r source/tmpl/*.* source/dist/
+	cp -r frontend/public/favicon source/dist/
 
 frontend-copy:
 	cp -r source/tmpl/*.* source/dist/

frontend/public/base.gohtml

@@ -6,43 +6,43 @@
     <title>{{CoreApp.Name}} - Service Monitoring</title>
     <meta name="title" content="{{CoreApp.Name}} - Service Monitoring">
     <meta name="description" content="{{CoreApp.Description}} {{CoreApp.Name}}">
+    <base href="{{BasePath}}">
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0, shrink-to-fit=no">
     <meta name="description" content="{{CoreApp.Description}}">
-    <link rel="apple-touch-icon" sizes="57x57" href="https://assets.statping.com/favicon/apple-icon-57x57.png">
-    <link rel="apple-touch-icon" sizes="60x60" href="https://assets.statping.com/favicon/apple-icon-60x60.png">
-    <link rel="apple-touch-icon" sizes="72x72" href="https://assets.statping.com/favicon/apple-icon-72x72.png">
-    <link rel="apple-touch-icon" sizes="76x76" href="https://assets.statping.com/favicon/apple-icon-76x76.png">
-    <link rel="apple-touch-icon" sizes="114x114" href="https://assets.statping.com/favicon/apple-icon-114x114.png">
-    <link rel="apple-touch-icon" sizes="120x120" href="https://assets.statping.com/favicon/apple-icon-120x120.png">
-    <link rel="apple-touch-icon" sizes="144x144" href="https://assets.statping.com/favicon/apple-icon-144x144.png">
-    <link rel="apple-touch-icon" sizes="152x152" href="https://assets.statping.com/favicon/apple-icon-152x152.png">
-    <link rel="apple-touch-icon" sizes="180x180" href="https://assets.statping.com/favicon/apple-icon-180x180.png">
-    <link rel="icon" type="image/png" sizes="192x192"  href="https://assets.statping.com/favicon/android-icon-192x192.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="https://assets.statping.com/favicon/favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="96x96" href="https://assets.statping.com/favicon/favicon-96x96.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="https://assets.statping.com/favicon/favicon-16x16.png">
-    <link rel="manifest" href="https://assets.statping.com/favicon/manifest.json">
+    <link rel="apple-touch-icon" sizes="57x57" href="favicon/apple-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="favicon/apple-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="favicon/apple-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="favicon/apple-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="favicon/apple-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="favicon/apple-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="favicon/apple-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="favicon/apple-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="favicon/apple-icon-180x180.png">
+    <link rel="icon" type="image/png" sizes="192x192"  href="favicon/android-icon-192x192.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="favicon/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="96x96" href="favicon/favicon-96x96.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="favicon/favicon-16x16.png">
+    <link rel="manifest" href="favicon/manifest.json">
     <meta name="msapplication-TileColor" content="#ffffff">
-    <meta name="msapplication-TileImage" content="https://assets.statping.com/favicon/ms-icon-144x144.png">
+    <meta name="msapplication-TileImage" content="favicon/ms-icon-144x144.png">
     <meta name="theme-color" content="#ffffff">
-    <link rel="shortcut icon" href="https://assets.statping.com/favicon/favicon.ico" type="image/x-icon">
-    <link rel="icon" href="https://assets.statping.com/favicon/favicon.ico" type="image/x-icon">
+    <link rel="shortcut icon" href="favicon/favicon.ico" type="image/x-icon">
+    <link rel="icon" href="favicon/favicon.ico" type="image/x-icon">
 
     <meta property="og:type" content="website">
     <meta property="og:url" content="{{CoreApp.Domain}}">
     <meta property="og:title" content="{{CoreApp.Name}} Service Monitoring">
     <meta property="og:description" content="{{CoreApp.Description}} {{CoreApp.Name}}">
-    <meta property="og:image" content="https://assets.statping.com/statping_social.png">
+    <meta property="og:image" content="favicon/social.png">
 
     <meta property="twitter:card" content="summary_large_image">
     <meta property="twitter:url" content="{{CoreApp.Domain}}">
     <meta property="twitter:title" content="{{CoreApp.Name}} Service Monitoring">
     <meta property="twitter:description" content="{{CoreApp.Description}} {{CoreApp.Name}}">
-    <meta property="twitter:image" content="https://assets.statping.com/statping_social.png">
+    <meta property="twitter:image" content="favicon/social.png">
 
-    <base href="{{BasePath}}">
     {{if USE_CDN}}
     <link rel="stylesheet" href="https://assets.statping.com/vendor.css">
     <link rel="stylesheet" href="https://assets.statping.com/style.css">

frontend/public/favicon/browserconfig.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig><msapplication><tile><square70x70logo src="/ms-icon-70x70.png"/><square150x150logo src="/ms-icon-150x150.png"/><square310x310logo src="/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>

frontend/public/favicon/manifest.json

@@ -0,0 +1,41 @@
+{
+ "name": "Statping",
+ "icons": [
+  {
+   "src": "favicon\/android-icon-36x36.png",
+   "sizes": "36x36",
+   "type": "image\/png",
+   "density": "0.75"
+  },
+  {
+   "src": "favicon\/android-icon-48x48.png",
+   "sizes": "48x48",
+   "type": "image\/png",
+   "density": "1.0"
+  },
+  {
+   "src": "favicon\/android-icon-72x72.png",
+   "sizes": "72x72",
+   "type": "image\/png",
+   "density": "1.5"
+  },
+  {
+   "src": "favicon\/android-icon-96x96.png",
+   "sizes": "96x96",
+   "type": "image\/png",
+   "density": "2.0"
+  },
+  {
+   "src": "favicon\/android-icon-144x144.png",
+   "sizes": "144x144",
+   "type": "image\/png",
+   "density": "3.0"
+  },
+  {
+   "src": "favicon\/android-icon-192x192.png",
+   "sizes": "192x192",
+   "type": "image\/png",
+   "density": "4.0"
+  }
+ ]
+}

handlers/routes.go

@@ -73,8 +73,8 @@ func Router() *mux.Router {
 		r.PathPrefix("/css/").Handler(http.StripPrefix(basePath, Gzip(staticAssets("css"))))
 		r.PathPrefix("/js/").Handler(http.StripPrefix(basePath, Gzip(staticAssets("js"))))
 		r.PathPrefix("/scss/").Handler(http.StripPrefix(basePath, Gzip(staticAssets("scss"))))
+		r.PathPrefix("/favicon/").Handler(http.StripPrefix(basePath, Gzip(staticAssets("favicon"))))
 		r.PathPrefix("/robots.txt").Handler(http.StripPrefix(basePath, indexHandler))
-		r.PathPrefix("/favicon.ico").Handler(http.StripPrefix(basePath, indexHandler))
 		r.PathPrefix("/banner.png").Handler(http.StripPrefix(basePath, indexHandler))
 	} else {
 		tmplFileSrv := http.FileServer(source.TmplBox.HTTPBox())
@@ -83,8 +83,8 @@ func Router() *mux.Router {
 		r.PathPrefix("/css/").Handler(http.StripPrefix(basePath, Gzip(tmplFileSrv)))
 		r.PathPrefix("/scss/").Handler(http.StripPrefix(basePath, Gzip(tmplFileSrv)))
 		r.PathPrefix("/js/").Handler(http.StripPrefix(basePath, Gzip(tmplFileSrv)))
+		r.PathPrefix("/favicon/").Handler(http.StripPrefix(basePath, Gzip(tmplFileSrv)))
 		r.PathPrefix("/robots.txt").Handler(tmplBoxHandler)
-		r.PathPrefix("/favicon.ico").Handler(tmplBoxHandler)
 		r.PathPrefix("/banner.png").Handler(tmplBoxHandler)
 	}