Re-add SQLite import support, but make it a build-time option.

This commit is contained in:
Mikkel Krautz 2011-08-27 20:52:06 +02:00
parent 48efaf6645
commit 4d5b897d66
11 changed files with 265 additions and 79 deletions

View file

@ -1184,7 +1184,7 @@ func (s *Server) ListenAndMurmur() {
go s.SendUDP()
// Create a new listening TLS socket.
cert, err := tls.LoadX509KeyPair(filepath.Join(*datadir, "cert"), filepath.Join(*datadir, "key"))
cert, err := tls.LoadX509KeyPair(filepath.Join(Args.DataDir, "cert"), filepath.Join(Args.DataDir, "key"))
if err != nil {
s.Printf("Unable to load x509 key pair: %v", err)
return