Disable /gpgupdate/ URL by default

diff --git a/gocheese.go b/gocheese.go
index ff76c870c3183a6b81e462ee131caa9ad679934f..40f172bc9eedb50d5c337572d5da5036f760ac15 100644 (file)
--- a/gocheese.go
+++ b/gocheese.go
@@ -701,7 +701,9 @@ func main() {
        }
        http.HandleFunc(*norefreshURLPath, handler)
        http.HandleFunc(*refreshURLPath, handler)
-       http.HandleFunc(*gpgUpdateURLPath, handler)
+       if *gpgUpdateURLPath != "" {
+               http.HandleFunc(*gpgUpdateURLPath, handler)
+       }
 
        needsRefreshPasswd := make(chan os.Signal, 0)
        needsShutdown := make(chan os.Signal, 0)

diff --git a/pyshop2packages.sh b/pyshop2packages.sh
index 2a3e2b243cd5e0afd485b27b7bdd38e522533ffd..034f8c1d8859e943f2a9e258c1684319aecf0132 100755 (executable)
--- a/pyshop2packages.sh
+++ b/pyshop2packages.sh
@@ -51,6 +51,7 @@ done
 ########################################################################
 cd packages
 for pkg in * ; do
+    # Assume gocheese -gpgupdate /gpgupdate/
     curl http://localhost:8080/gpgupdate/$pkg/ > /dev/null
 done