Merge branch 'minor' of sindre/Beelance into master

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
 

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';

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'