From 23af746182cefb51c787012f9dbcc651de3e86ad Mon Sep 17 00:00:00 2001 From: Daniel Oaks Date: Thu, 5 Oct 2017 20:55:15 +1000 Subject: [PATCH] Rip out the rest of the web interface --- cmd/oragono-web/oragono-web.go | 67 ---------------------------------- 1 file changed, 67 deletions(-) delete mode 100644 cmd/oragono-web/oragono-web.go diff --git a/cmd/oragono-web/oragono-web.go b/cmd/oragono-web/oragono-web.go deleted file mode 100644 index 7d8fa2ac..00000000 --- a/cmd/oragono-web/oragono-web.go +++ /dev/null @@ -1,67 +0,0 @@ -// Copyright (c) 2016- Daniel Oaks -// released under the MIT license - -package main - -import ( - "fmt" - "log" - - "github.com/docopt/docopt-go" - "github.com/oragono/oragono/mkcerts" - "github.com/oragono/oragono/web" -) - -func main() { - version := irc.SemVer - usage := `oragono-web. -Usage: - oragono-web mkcerts [--conf ] [--quiet] - oragono-web run [--conf ] [--quiet] - oragono-web -h | --help - oragono-web --version -Options: - --conf Configuration file to use [default: web.yaml]. - --quiet Don't show startup/shutdown lines. - -h --help Show this screen. - --version Show version.` - - arguments, _ := docopt.Parse(usage, nil, true, version, false) - - configfile := arguments["--conf"].(string) - config, err := web.LoadConfig(configfile) - if err != nil { - log.Fatal("Config file did not load successfully:", err.Error()) - } - - if arguments["mkcerts"].(bool) { - if !arguments["--quiet"].(bool) { - log.Println("making self-signed certificates") - } - - for name, conf := range config.TLSListenersConf { - log.Printf(" making cert for %s listener\n", name) - host := config.Host - err := mkcerts.CreateCert("Oragono web interface", host, conf.Cert, conf.Key) - if err == nil { - if !arguments["--quiet"].(bool) { - log.Printf(" Certificate created at %s : %s\n", conf.Cert, conf.Key) - } - } else { - log.Fatal(" Could not create certificate:", err.Error()) - } - } - } else if arguments["run"].(bool) { - irc.Log.SetLevel(config.Log) - server := web.NewServer(config) - if server == nil { - log.Println("Could not load server") - return - } - if !arguments["--quiet"].(bool) { - log.Println(fmt.Sprintf("Oragono web interface v%s running", irc.SemVer)) - defer log.Println(irc.SemVer, "exiting") - } - server.Run() - } -}