From cb0219dbba0e12b97d35996f5ac25d3f9918684d Mon Sep 17 00:00:00 2001 From: Sindre Stephansen Date: Tue, 17 Mar 2020 15:01:12 +0100 Subject: [PATCH] Remove initial admin user, and change the database password Fixes #7 --- mysql/Dockerfile | 2 +- mysql/sql/init.sql | 10 ---------- src/app/models/database.py | 3 +-- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/mysql/Dockerfile b/mysql/Dockerfile index 486a081..ba82959 100755 --- a/mysql/Dockerfile +++ b/mysql/Dockerfile @@ -3,7 +3,7 @@ FROM mysql:5.7.15 MAINTAINER me ENV MYSQL_DATABASE=db \ - MYSQL_ROOT_PASSWORD=root + MYSQL_ROOT_PASSWORD=7OvXmh8LucA1sgfpAQrKWTjy ADD /sql/init.sql /docker-entrypoint-initdb.d diff --git a/mysql/sql/init.sql b/mysql/sql/init.sql index 8733a71..a25a17b 100755 --- a/mysql/sql/init.sql +++ b/mysql/sql/init.sql @@ -86,16 +86,6 @@ CREATE TABLE task_files ( * Initial data */ -insert into users values (NULL, "admin", "$2b$12$iKbYZ0MFwWWxoYUXKRhFiOPo7itaQO2DIRnLgXbECsj8XKVzkNCSi", "Admin Modsen", "ntnu", 'mail@ntnu.no', "street", "trondheim", "trondheim", "1234", "norway", 0, 0); - insert into project_category values (NULL, "Gardening"); insert into project_category values (NULL, "Programming"); insert into project_category values (NULL, "Grocery shopping"); - - -/* -Create default database user -*/ - -CREATE USER 'root'@'10.5.0.6' IDENTIFIED BY 'root'; -GRANT ALL PRIVILEGES ON db.* TO 'root'@'10.5.0.6'; diff --git a/src/app/models/database.py b/src/app/models/database.py index cecd949..1c13032 100755 --- a/src/app/models/database.py +++ b/src/app/models/database.py @@ -1,5 +1,4 @@ import mysql.connector -from dotenv import load_dotenv import os groupid = os.getenv("groupid").lstrip("0") @@ -11,7 +10,7 @@ preconfigured docker container address use the Docker address. The default port """ db = mysql.connector.connect( user='root', - password='root', + password='7OvXmh8LucA1sgfpAQrKWTjy', host='10.' + groupid + '.0.5', # Docker address # host='0.0.0.0', # Local address database='db'