From c9d0a1312de88b3ff87ab0d945597ae243c420b8 Mon Sep 17 00:00:00 2001 From: obissick Date: Sat, 4 Jan 2020 00:33:43 -0500 Subject: [PATCH] dbport option and fix login issue. --- app/create_db.py | 5 +++-- app/haproxy-wi.cfg | 1 + app/haproxy-wi.db.sql | 6 +++--- app/sql.py | 3 ++- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/create_db.py b/app/create_db.py index a3b702ff..7b8e8340 100644 --- a/app/create_db.py +++ b/app/create_db.py @@ -7,7 +7,8 @@ if mysql_enable == '1': mysql_user = funct.get_config_var('mysql', 'mysql_user') mysql_password = funct.get_config_var('mysql', 'mysql_password') mysql_db = funct.get_config_var('mysql', 'mysql_db') - mysql_host = funct.get_config_var('mysql', 'mysql_host') + mysql_host = funct.get_config_var('mysql', 'mysql_host') + mysql_port = funct.get_config_var('mysql', 'mysql_port') import mysql.connector as sqltool else: db = "/var/www/haproxy-wi/app/haproxy-wi.db" @@ -52,7 +53,7 @@ def get_cur(): con = sqltool.connect(db, isolation_level=None) else: con = sqltool.connect(user=mysql_user, password=mysql_password, - host=mysql_host, + host=mysql_host, port=mysql_port, database=mysql_db) cur = con.cursor() except sqltool.Error as e: diff --git a/app/haproxy-wi.cfg b/app/haproxy-wi.cfg index a5b31e27..3613ef35 100644 --- a/app/haproxy-wi.cfg +++ b/app/haproxy-wi.cfg @@ -17,4 +17,5 @@ mysql_user = haproxy-wi mysql_password = haproxywi mysql_db = haproxywi mysql_host = 127.0.0.1 +mysql_port = 3306 diff --git a/app/haproxy-wi.db.sql b/app/haproxy-wi.db.sql index 3014aed4..2f5199ba 100644 --- a/app/haproxy-wi.db.sql +++ b/app/haproxy-wi.db.sql @@ -1,7 +1,7 @@ CREATE TABLE IF NOT EXISTS `user` (`id` INTEGER NOT NULL AUTO_INCREMENT,`username` VARCHAR ( 64 ) UNIQUE,`email` VARCHAR ( 120 ) UNIQUE, `password` VARCHAR ( 128 ),`role` VARCHAR ( 128 ),`groups` VARCHAR ( 120 ), PRIMARY KEY(`id`) ); -INSERT INTO `user` (username, email, password, role, groups) VALUES ('admin','admin@localhost','admin','admin','1'); -INSERT INTO `user` (username, email, password, role, groups) VALUES ('editor','editor@localhost','editor','editor','1'); -INSERT INTO `user` (username, email, password, role, groups) VALUES ('guest','guest@localhost','guest','guest','1'); +INSERT INTO `user` (username, email, password, role, groups) VALUES ('admin','admin@localhost','21232f297a57a5a743894a0e4a801fc3','admin','1'); +INSERT INTO `user` (username, email, password, role, groups) VALUES ('editor','editor@localhost','5aee9dbd2a188839105073571bee1b1f','editor','1'); +INSERT INTO `user` (username, email, password, role, groups) VALUES ('guest','guest@localhost','084e0343a0486ff05530df6c705c8bb4','guest','1'); CREATE TABLE IF NOT EXISTS `servers` (`id` INTEGER NOT NULL AUTO_INCREMENT,`hostname` VARCHAR ( 64 ) UNIQUE,`ip` VARCHAR ( 64 ) UNIQUE,`groups` VARCHAR ( 64 ), type_ip INTEGER NOT NULL DEFAULT 0, enable INTEGER NOT NULL DEFAULT 1, master INTEGER NOT NULL DEFAULT 0, cred INTEGER NOT NULL DEFAULT 1, alert INTEGER NOT NULL DEFAULT 0, metrics INTEGER NOT NULL DEFAULT 0, PRIMARY KEY(`id`) ); CREATE TABLE IF NOT EXISTS `role` (`id` INTEGER NOT NULL AUTO_INCREMENT,`name` VARCHAR ( 80 ) UNIQUE,`description` VARCHAR ( 255 ),PRIMARY KEY(`id`) ); INSERT INTO `role` (name, description) VALUES ('admin','Can do everything'); diff --git a/app/sql.py b/app/sql.py index 8e9bacf7..6e950bf9 100644 --- a/app/sql.py +++ b/app/sql.py @@ -20,8 +20,9 @@ def get_cur(): mysql_password = funct.get_config_var('mysql', 'mysql_password') mysql_db = funct.get_config_var('mysql', 'mysql_db') mysql_host = funct.get_config_var('mysql', 'mysql_host') + mysql_port = funct.get_config_var('mysql', 'mysql_port') con = sqltool.connect(user=mysql_user, password=mysql_password, - host=mysql_host, + host=mysql_host, port=mysql_port, database=mysql_db) cur = con.cursor() except sqltool.Error as e: