HimbeerserverDE
/
multiserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add default values for PostgreSQL host

master
HimbeerserverDE 2021-04-22 13:50:30 +02:00
parent 9ce9f0f48c
commit 3b6bce9964
No known key found for this signature in database
GPG Key ID: 1A651504791E6A8B
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
auth.go
View File

@ -56,8 +56,8 @@ CREATE TABLE IF NOT EXISTS ban (
);`) );`)
} }
psql := func(host, name, user, password string, port int) (*DB, error) { psql := func(name, user, password, host string, port int) (*DB, error) {
return OpenPSQL(host, name, user, password, `CREATE TABLE IF NOT EXISTS auth ( return OpenPSQL(name, user, password, `CREATE TABLE IF NOT EXISTS auth (
name VARCHAR(32) PRIMARY KEY NOT NULL, name VARCHAR(32) PRIMARY KEY NOT NULL,
password VARCHAR(512) NOT NULL password VARCHAR(512) NOT NULL
); );
@ -68,7 +68,7 @@ CREATE TABLE IF NOT EXISTS privileges (
CREATE TABLE IF NOT EXISTS ban ( CREATE TABLE IF NOT EXISTS ban (
addr VARCHAR(39) PRIMARY KEY NOT NULL, addr VARCHAR(39) PRIMARY KEY NOT NULL,
name VARCHAR(32) NOT NULL name VARCHAR(32) NOT NULL
);`, port) );`, host, port)
} }
db, ok := ConfKey("psql_db").(string) db, ok := ConfKey("psql_db").(string)
@ -78,13 +78,12 @@ CREATE TABLE IF NOT EXISTS ban (
host, ok := ConfKey("psql_host").(string) host, ok := ConfKey("psql_host").(string)
if !ok { if !ok {
log.Print("PostgreSQL host not set or not a string") host = "localhost"
return sqlite3()
} }
port, ok := ConfKey("psql_port").(int) port, ok := ConfKey("psql_port").(int)
if !ok { if !ok {
log.Print("PostgreSQL port not set or not an integer") port = 5432
return sqlite3() return sqlite3()
} }
@ -100,7 +99,7 @@ CREATE TABLE IF NOT EXISTS ban (
return sqlite3() 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 // CreateUser creates a new entry in the authentication database

2
db.go
View File

@ -38,7 +38,7 @@ func OpenSQLite3(name, initSQL string) (*DB, error) {
} }
// OpenPSQL opens and returns a PostgreSQL database // 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) 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) db, err := sql.Open("postgres", psqlconn)