summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2021-02-11 14:17:44 +0100
committerRuben Pollan <meskio@sindominio.net>2021-02-11 16:27:18 +0100
commitec03343a76291f10fd2216ef74addff98b9701f9 (patch)
tree82206a737191d5ad3c5962cc7e6e5c8092a90359
parent4698b744ff45c7ffa4674daec0bceffab48cd6ef (diff)
Rename the project to menshen
- Closes: #4
-rw-r--r--.gitignore2
-rw-r--r--Dockerfile6
-rw-r--r--chaperone.d/getmyip.conf4
-rw-r--r--chaperone.d/menshen.conf4
-rw-r--r--main.go2
-rw-r--r--metrics.go2
6 files changed, 10 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore
index 79c9b0e..22de89e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-getmyip
+menshen
.*.swp
.*.swo
diff --git a/Dockerfile b/Dockerfile
index e3aa34b..f9279ca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,11 +6,11 @@ RUN apt-get -q update && env DEBIAN_FRONTEND=noninteractive apt-get install -y -
# don't need to do bash tricks to keep the layers small, as this is a multi-stage build
ENV GOPATH=/go
WORKDIR $GOPATH
-RUN go get 0xacab.org/leap/getmyip
-RUN strip $GOPATH/bin/getmyip
+RUN go get 0xacab.org/leap/menshen
+RUN strip $GOPATH/bin/menshen
FROM registry.git.autistici.org/ai3/docker/chaperone-base
-COPY --from=build /go/bin/getmyip /usr/local/bin/getmyip
+COPY --from=build /go/bin/menshen /usr/local/bin/menshen
COPY chaperone.d/ /etc/chaperone.d
ENTRYPOINT ["/usr/local/bin/chaperone"]
diff --git a/chaperone.d/getmyip.conf b/chaperone.d/getmyip.conf
deleted file mode 100644
index ddafba3..0000000
--- a/chaperone.d/getmyip.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-getmyip.service: {
- command: "/usr/local/bin/getmyip -notls",
- exit_kills: true
-}
diff --git a/chaperone.d/menshen.conf b/chaperone.d/menshen.conf
new file mode 100644
index 0000000..9a39e53
--- /dev/null
+++ b/chaperone.d/menshen.conf
@@ -0,0 +1,4 @@
+menshen.service: {
+ command: "/usr/local/bin/menshen -notls",
+ exit_kills: true
+}
diff --git a/main.go b/main.go
index a7fa072..dc6cfdf 100644
--- a/main.go
+++ b/main.go
@@ -155,7 +155,7 @@ func geolocateCity(city string) coordinates {
}
}
- log.Println("WARN: cannot geolocate", city, "- make sure to add manual coordinates to getmyip")
+ log.Println("WARN: cannot geolocate", city, "- make sure to add manual coordinates to menshen")
return coordinates{0, 0}
}
diff --git a/metrics.go b/metrics.go
index 2c581ba..bfa9678 100644
--- a/metrics.go
+++ b/metrics.go
@@ -6,7 +6,7 @@ import (
)
var hitsPerCountry = promauto.NewCounterVec(prometheus.CounterOpts{
- Name: "getmyip_hits",
+ Name: "menshen_hits",
Help: "Number of hits in the geolocation service",
},
[]string{"country"},