From c4a8662d016a4eaf1e4d9c4fb8898175eba5615a Mon Sep 17 00:00:00 2001
From: Kevin Lyda <kevin@ie.suberic.net>
Date: Wed, 1 Feb 2017 12:15:21 +0000
Subject: [PATCH] Add some static files.
---
cmd/gqgmcd/main.go | 13 ++++++++++++-
static/favicon.ico | Bin 0 -> 1150 bytes
static/humans.txt | 17 +++++++++++++++++
static/robots.txt | 3 +++
4 files changed, 32 insertions(+), 1 deletion(-)
create mode 100644 static/favicon.ico
create mode 100644 static/humans.txt
create mode 100644 static/robots.txt
diff --git a/cmd/gqgmcd/main.go b/cmd/gqgmcd/main.go
index 6536e37..c1c415a 100644
--- a/cmd/gqgmcd/main.go
+++ b/cmd/gqgmcd/main.go
@@ -13,6 +13,7 @@ import (
"log"
"net/http"
"path"
+ //"sync"
"github.com/prometheus/client_golang/prometheus/promhttp"
"gitlab.com/lyda/gqgmc/devices/geiger"
@@ -21,7 +22,8 @@ import (
var addr = flag.String("listen-address", ":8080", "Address for HTTP requests.")
var device = flag.String("device", "/dev/gqgmc", "Device for Geiger Counter.")
var model = flag.String("model", "gqgmc", "Model of Geiger Counter.")
-var templateDir = flag.String("template_dir", "templates", "Template directory.")
+var templateDir = flag.String("template-dir", "templates", "Template directory.")
+var staticDir = flag.String("static-dir", "static", "Static files directory.")
type indexPage struct {
Model string
@@ -44,6 +46,11 @@ func indexHandler(w http.ResponseWriter, r *http.Request) {
t.Execute(w, &indexPg)
}
+func staticHandler(w http.ResponseWriter, r *http.Request) {
+ staticFile := path.Join(*staticDir, path.Base(r.URL.Path))
+ http.ServeFile(w, r, staticFile)
+}
+
func main() {
flag.Parse()
@@ -52,6 +59,10 @@ func main() {
indexPg.Version = gc.Version()
indexPg.Serial = gc.Serial()
http.HandleFunc("/", indexHandler)
+ http.HandleFunc("/favicon.ico", staticHandler)
+ http.HandleFunc("/robots.txt", staticHandler)
+ http.HandleFunc("/humans.txt", staticHandler)
http.Handle("/metrics", promhttp.Handler())
+ http.Handle("/static", http.StripPrefix("/static/", http.FileServer(http.Dir(*staticDir))))
log.Fatal(http.ListenAndServe(*addr, nil))
}
diff --git a/static/favicon.ico b/static/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..9a59519a3ec438437e563d01b0e43694f13d918b
GIT binary patch
literal 1150
zcmZQzU}Ruq5D);-3Je)63=Con3=A3!3=9Gc3=9ek5OD?&U}0bo;)Y-l7li*Kfq(!0
z!FhlG{>92hRs&Z6W&Hg4^Z&_{C;z{A@d7LYG6RG`9FQ1D4x|ReN5(KUD_5@kzi{Eg
z|5K(+`M+h$7Pt}+8zcsj1E~Q?!1RFFFgMMZG2{QYZ{I*d|L4t{_kZiwtzZmdg9Jfx
zAT=O1Ob>_+Gi%nYS^r<Ze*GUNm!F^iAA~__Kw==dnKNgCxc^~#K=kk5zrkYb)~)-0
z;lc$l`{KomV1Izz4Pt`?L2@89AT~%3NH2)}>({UUckbNzKViaz|5;gC|CcXc{@>5f
z@Bh@PQ^6R-28n^>Kx#m0L3%)XL1y;#_5EM9YSsTsmo9<Lm_2*;|D8K`f~3J1#GW%}
z4p<JP2Ba3G2c);DsR`^Cm|H+$otBmc)@NsD_aB5ooYd4*c$|RLf^c(l^Z&NCw*QYF
zJ%WcBD9mADmXnk7AA~{rL1LRWZ2~dDYC(EHdY?Rb@*m`0P}pzVw(WmQOA9#eKyeLL
z{Qo~VO@QLCv9a+#NDW9WNDoLa$Q>YcptxPIV8Q>|+FG#R!^6YDZUfl?VuQk<y1M%R
z{Q2|$fB*g+qy_A6P`tvza?P4G|8L#81(tjD>J>cxKx~lU&6_vD;S6Gf^nmn&*f1It
z#_!&}1N#poURYT8AA~_{kQ$I2$n7vbhz4Ph9EhGieLC1}AhUaVdj6k2eHx5GY>*hp
y-P5K`11W{u0ph^I02Fua?d|_NJ3IfMIdcXi1;!vYNDL$gQUel%=>e4ilwbh1GjV(X
literal 0
HcmV?d00001
diff --git a/static/humans.txt b/static/humans.txt
new file mode 100644
index 0000000..55028f5
--- /dev/null
+++ b/static/humans.txt
@@ -0,0 +1,17 @@
+/* TEAM */
+
+TODO
+Your title: Your name.
+Site: email, link to a contact form, etc.
+Twitter: your Twitter username.
+Location: City, Country.
+
+/* THANKS */
+
+TODO
+
+/* SITE */
+
+Standards: Let me know if things aren't valid HTML/CSS/JS
+Components: Go, Prometheus
+Software: Developed using Linux, vim and git.
diff --git a/static/robots.txt b/static/robots.txt
new file mode 100644
index 0000000..2bf371c
--- /dev/null
+++ b/static/robots.txt
@@ -0,0 +1,3 @@
+User-Agent: *
+Disallow:
+Disallow: /metrics
--
GitLab