Armored signature

[gocheese.git] / main.go

diff --git a/main.go b/main.go
index c14906fb7c87ac04b9308b426850c2efb59346b3..f0ef9693c9405f623ba39e20c0e28a0c48f144f5 100644 (file)
--- a/main.go
+++ b/main.go
@@ -44,7 +44,7 @@ import (
 )
 
 const (
-       Version   = "3.7.0"
+       Version   = "4.1.0"
        UserAgent = "GoCheese/" + Version
 )
 
@@ -59,7 +59,6 @@ var (
 
        NoRefreshURLPath = flag.String("norefresh", DefaultNoRefreshURLPath, "")
        RefreshURLPath   = flag.String("refresh", DefaultRefreshURLPath, "")
-       GPGUpdateURLPath = flag.String("gpgupdate", DefaultGPGUpdateURLPath, "")
        JSONURLPath      = flag.String("json", DefaultJSONURLPath, "")
 
        PyPIURL      = flag.String("pypi", DefaultPyPIURL, "")
@@ -82,7 +81,7 @@ func servePkg(w http.ResponseWriter, r *http.Request, pkgName, filename string)
        log.Println(r.RemoteAddr, "get", filename)
        path := filepath.Join(Root, pkgName, filename)
        if _, err := os.Stat(path); os.IsNotExist(err) {
-               if !refreshDir(w, r, pkgName, filename, false) {
+               if !refreshDir(w, r, pkgName, filename) {
                        return
                }
        }
@@ -95,16 +94,11 @@ func handler(w http.ResponseWriter, r *http.Request) {
        case "GET":
                var path string
                var autorefresh bool
-               var gpgUpdate bool
                if strings.HasPrefix(r.URL.Path, *NoRefreshURLPath) {
                        path = strings.TrimPrefix(r.URL.Path, *NoRefreshURLPath)
                } else if strings.HasPrefix(r.URL.Path, *RefreshURLPath) {
                        path = strings.TrimPrefix(r.URL.Path, *RefreshURLPath)
                        autorefresh = true
-               } else if strings.HasPrefix(r.URL.Path, *GPGUpdateURLPath) {
-                       path = strings.TrimPrefix(r.URL.Path, *GPGUpdateURLPath)
-                       autorefresh = true
-                       gpgUpdate = true
                } else {
                        http.Error(w, "unknown action", http.StatusBadRequest)
                        return
@@ -118,7 +112,7 @@ func handler(w http.ResponseWriter, r *http.Request) {
                        if parts[0] == "" {
                                listRoot(w, r)
                        } else {
-                               serveListDir(w, r, parts[0], autorefresh, gpgUpdate)
+                               serveListDir(w, r, parts[0], autorefresh)
                        }
                } else {
                        servePkg(w, r, parts[0], parts[1])
@@ -157,7 +151,7 @@ func main() {
        }
        Root = flag.Args()[0]
        if _, err := os.Stat(Root); err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
 
        if *FSCK {
@@ -184,7 +178,7 @@ func main() {
                                        os.FileMode(0666),
                                )
                                if err != nil {
-                                       log.Fatalln(err)
+                                       log.Fatal(err)
                                }
                                passwdReader(fd)
                                fd.Close()
@@ -200,7 +194,7 @@ func main() {
                                        os.FileMode(0666),
                                )
                                if err != nil {
-                                       log.Fatalln(err)
+                                       log.Fatal(err)
                                }
                                passwdLister(fd)
                                fd.Close()
@@ -209,7 +203,7 @@ func main() {
        }
 
        if (*TLSCert != "" && *TLSKey == "") || (*TLSCert == "" && *TLSKey != "") {
-               log.Fatalln("Both -tls-cert and -tls-key are required")
+               log.Fatal("Both -tls-cert and -tls-key are required")
        }
 
        UmaskCur = syscall.Umask(0)
@@ -218,7 +212,7 @@ func main() {
        var err error
        PyPIURLParsed, err = url.Parse(*PyPIURL)
        if err != nil {
-               log.Fatalln(err)
+               log.Fatal(err)
        }
        tlsConfig := tls.Config{
                ClientSessionCache: tls.NewLRUClientSessionCache(16),
@@ -231,7 +225,7 @@ func main() {
        if *PyPICertHash != "" {
                ourDgst, err := hex.DecodeString(*PyPICertHash)
                if err != nil {
-                       log.Fatalln(err)
+                       log.Fatal(err)
                }
                tlsConfig.VerifyConnection = func(s tls.ConnectionState) error {
                        spki := s.VerifiedChains[0][0].RawSubjectPublicKeyInfo
@@ -252,9 +246,6 @@ func main() {
        http.HandleFunc(*JSONURLPath, serveJSON)
        http.HandleFunc(*NoRefreshURLPath, handler)
        http.HandleFunc(*RefreshURLPath, handler)
-       if *GPGUpdateURLPath != "" {
-               http.HandleFunc(*GPGUpdateURLPath, handler)
-       }
 
        if *DoUCSPI {
                server.SetKeepAlivesEnabled(false)
@@ -262,7 +253,7 @@ func main() {
                server.ConnState = connStater
                err := server.Serve(ln)
                if _, ok := err.(UCSPIAlreadyAccepted); !ok {
-                       log.Fatalln(err)
+                       log.Fatal(err)
                }
                UCSPIJob.Wait()
                return