From b63bd3031d3b1a426d044922fdeec10b28cef204 Mon Sep 17 00:00:00 2001
From: Massimiliano Adamo <maxadamo@gmail.com>
Date: Thu, 1 Sep 2022 02:35:09 +0200
Subject: [PATCH] rolling back config
---
go.mod | 10 +++++-----
go.sum | 16 ++++++++++++++--
main.go | 9 ---------
3 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/go.mod b/go.mod
index ae64a4d..466e458 100644
--- a/go.mod
+++ b/go.mod
@@ -1,10 +1,10 @@
module acme-web
-go 1.17
-
-require github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815
+go 1.18
require (
- github.com/gorilla/mux v1.8.0 // indirect
- gopkg.in/ini.v1 v1.67.0 // indirect
+ github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815
+ gopkg.in/ini.v1 v1.67.0
)
+
+require github.com/stretchr/testify v1.8.0 // indirect
diff --git a/go.sum b/go.sum
index cbc4f0a..c96f08c 100644
--- a/go.sum
+++ b/go.sum
@@ -1,6 +1,18 @@
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 h1:bWDMxwH3px2JBh6AyO7hdCn/PkvCZXii8TGj7sbtEbQ=
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
-github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
-github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/main.go b/main.go
index f0e6055..c9508d1 100644
--- a/main.go
+++ b/main.go
@@ -10,7 +10,6 @@ import (
"strings"
"github.com/docopt/docopt-go"
- "github.com/gorilla/mux"
"gopkg.in/ini.v1"
)
@@ -104,11 +103,6 @@ func redirect(w http.ResponseWriter, req *http.Request) {
http.Redirect(w, req, redirectURL, http.StatusMovedPermanently)
}
-// throw 404
-func throwNotFound(w http.ResponseWriter, req *http.Request) {
- http.NotFound(w, req)
-}
-
func main() {
progName := filepath.Base(os.Args[0])
@@ -184,9 +178,6 @@ Options:
http.HandleFunc(otherElement, renderPage)
}
- rtr := mux.NewRouter()
- rtr.HandleFunc("/number/{.+}", throwNotFound)
-
if listenAddress == "any" {
log.Fatal(http.ListenAndServe(fmt.Sprintf(":%v", listenPort), nil))
} else {
--
GitLab