diff --git a/auth.go b/auth.go index 5575459..49fbf88 100644 --- a/auth.go +++ b/auth.go @@ -56,8 +56,8 @@ CREATE TABLE IF NOT EXISTS ban ( );`) } - psql := func(host, name, user, password string, port int) (*DB, error) { - return OpenPSQL(host, name, user, password, `CREATE TABLE IF NOT EXISTS auth ( + psql := func(name, user, password, host string, port int) (*DB, error) { + return OpenPSQL(name, user, password, `CREATE TABLE IF NOT EXISTS auth ( name VARCHAR(32) PRIMARY KEY NOT NULL, password VARCHAR(512) NOT NULL ); @@ -68,7 +68,7 @@ CREATE TABLE IF NOT EXISTS privileges ( CREATE TABLE IF NOT EXISTS ban ( addr VARCHAR(39) PRIMARY KEY NOT NULL, name VARCHAR(32) NOT NULL -);`, port) +);`, host, port) } db, ok := ConfKey("psql_db").(string) @@ -78,13 +78,12 @@ CREATE TABLE IF NOT EXISTS ban ( host, ok := ConfKey("psql_host").(string) if !ok { - log.Print("PostgreSQL host not set or not a string") - return sqlite3() + host = "localhost" } port, ok := ConfKey("psql_port").(int) if !ok { - log.Print("PostgreSQL port not set or not an integer") + port = 5432 return sqlite3() } @@ -100,7 +99,7 @@ CREATE TABLE IF NOT EXISTS ban ( return sqlite3() } - return psql(host, db, user, password, port) + return psql(db, user, password, host, port) } // CreateUser creates a new entry in the authentication database diff --git a/db.go b/db.go index 8d579e2..80c4de0 100644 --- a/db.go +++ b/db.go @@ -38,7 +38,7 @@ func OpenSQLite3(name, initSQL string) (*DB, error) { } // OpenPSQL opens and returns a PostgreSQL database -func OpenPSQL(host, name, user, password, initSQL string, port int) (*DB, error) { +func OpenPSQL(name, user, password, initSQL, host string, port int) (*DB, error) { psqlconn := fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=%s sslmode=disable", host, port, user, password, name) db, err := sql.Open("postgres", psqlconn)