|
@@ -20,15 +20,16 @@ func main() {
|
20
|
20
|
version := irc.SEM_VER
|
21
|
21
|
usage := `oragono.
|
22
|
22
|
Usage:
|
23
|
|
- oragono initdb [--conf <filename>]
|
24
|
|
- oragono upgradedb [--conf <filename>]
|
25
|
|
- oragono genpasswd [--conf <filename>]
|
26
|
|
- oragono mkcerts [--conf <filename>]
|
27
|
|
- oragono run [--conf <filename>]
|
|
23
|
+ oragono initdb [--conf <filename>] [--quiet]
|
|
24
|
+ oragono upgradedb [--conf <filename>] [--quiet]
|
|
25
|
+ oragono genpasswd [--conf <filename>] [--quiet]
|
|
26
|
+ oragono mkcerts [--conf <filename>] [--quiet]
|
|
27
|
+ oragono run [--conf <filename>] [--quiet]
|
28
|
28
|
oragono -h | --help
|
29
|
29
|
oragono --version
|
30
|
30
|
Options:
|
31
|
31
|
--conf <filename> Configuration file to use [default: ircd.yaml].
|
|
32
|
+ --quiet Don't show startup/shutdown lines.
|
32
|
33
|
-h --help Show this screen.
|
33
|
34
|
--version Show version.`
|
34
|
35
|
|
|
@@ -55,19 +56,27 @@ Options:
|
55
|
56
|
fmt.Println(encoded)
|
56
|
57
|
} else if arguments["initdb"].(bool) {
|
57
|
58
|
irc.InitDB(config.Datastore.Path)
|
58
|
|
- log.Println("database initialized: ", config.Datastore.Path)
|
|
59
|
+ if !arguments["--quiet"].(bool) {
|
|
60
|
+ log.Println("database initialized: ", config.Datastore.Path)
|
|
61
|
+ }
|
59
|
62
|
} else if arguments["upgradedb"].(bool) {
|
60
|
63
|
irc.UpgradeDB(config.Datastore.Path)
|
61
|
|
- log.Println("database upgraded: ", config.Datastore.Path)
|
|
64
|
+ if !arguments["--quiet"].(bool) {
|
|
65
|
+ log.Println("database upgraded: ", config.Datastore.Path)
|
|
66
|
+ }
|
62
|
67
|
} else if arguments["mkcerts"].(bool) {
|
63
|
|
- log.Println("making self-signed certificates")
|
|
68
|
+ if !arguments["--quiet"].(bool) {
|
|
69
|
+ log.Println("making self-signed certificates")
|
|
70
|
+ }
|
64
|
71
|
|
65
|
72
|
for name, conf := range config.Server.TLSListeners {
|
66
|
73
|
log.Printf(" making cert for %s listener\n", name)
|
67
|
74
|
host := config.Server.Name
|
68
|
75
|
err := mkcerts.CreateCert("Oragono", host, conf.Cert, conf.Key)
|
69
|
76
|
if err == nil {
|
70
|
|
- log.Printf(" Certificate created at %s : %s\n", conf.Cert, conf.Key)
|
|
77
|
+ if !arguments["--quiet"].(bool) {
|
|
78
|
+ log.Printf(" Certificate created at %s : %s\n", conf.Cert, conf.Key)
|
|
79
|
+ }
|
71
|
80
|
} else {
|
72
|
81
|
log.Fatal(" Could not create certificate:", err.Error())
|
73
|
82
|
}
|
|
@@ -75,8 +84,10 @@ Options:
|
75
|
84
|
} else if arguments["run"].(bool) {
|
76
|
85
|
irc.Log.SetLevel(config.Server.Log)
|
77
|
86
|
server := irc.NewServer(config)
|
78
|
|
- log.Println(irc.SEM_VER, "running")
|
79
|
|
- defer log.Println(irc.SEM_VER, "exiting")
|
|
87
|
+ if !arguments["--quiet"].(bool) {
|
|
88
|
+ log.Println(irc.SEM_VER, "running")
|
|
89
|
+ defer log.Println(irc.SEM_VER, "exiting")
|
|
90
|
+ }
|
80
|
91
|
server.Run()
|
81
|
92
|
}
|
82
|
93
|
}
|