diff --git a/new-env.sh b/new-env.sh deleted file mode 100755 index 2d949ef..0000000 --- a/new-env.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -cd ./src/MistoxWebsite.Client/ -npm install \ No newline at end of file diff --git a/src/MistoxWebsite.Server/Program.cs b/src/MistoxWebsite.Server/Program.cs index 7ebf9d4..b5d14b9 100755 --- a/src/MistoxWebsite.Server/Program.cs +++ b/src/MistoxWebsite.Server/Program.cs @@ -19,18 +19,18 @@ string dbUser = !string.IsNullOrEmpty(_dbuser) ? _dbuser : "root"; string? _dbdatabase = Environment.GetEnvironmentVariable("MySQLDatabase"); string dbdatabase = !string.IsNullOrEmpty(_dbdatabase) ? _dbdatabase : "mistox"; string? _dbpass = Environment.GetEnvironmentVariable("MySQLPass"); -string dbPass = !string.IsNullOrEmpty(_dbpass) ? _dbpass : ""; +string dbPass = !string.IsNullOrEmpty(_dbpass) ? _dbpass : "oasv34$8gpv023dd"; string connStr = "server=" + dbserver + ";user=" + dbUser + ";database=" + dbdatabase + ";password=" + dbPass + ";port=3306;"; DatabaseService databaseService = new DatabaseService( connectionString: connStr ); builder.Services.Add( new ServiceDescriptor( typeof( DatabaseService ), databaseService ) ); // Email Service string? _eServer = Environment.GetEnvironmentVariable("EmailServer"); -string EmailServer = !string.IsNullOrEmpty(_eServer) ? _eServer : "smtp.gmail.com"; +string EmailServer = !string.IsNullOrEmpty(_eServer) ? _eServer : "mail.mistox.com"; string? _ePort = Environment.GetEnvironmentVariable("EmailPort"); int EmailPort = !string.IsNullOrEmpty(_ePort) ? Convert.ToInt32(_ePort) : 587; string? _eAddress = Environment.GetEnvironmentVariable("EmailAddress"); -string EmailAddress = !string.IsNullOrEmpty(_eAddress) ? _eAddress : ""; +string EmailAddress = !string.IsNullOrEmpty(_eAddress) ? _eAddress : "no-reply@mistox.com"; string? _ePassword = Environment.GetEnvironmentVariable("EmailPassword"); string EmailPassword = !string.IsNullOrEmpty(_ePassword) ? _ePassword : ""; EmailService Emailservice = new EmailService( EmailServer, EmailPort, EmailAddress, EmailPassword ); diff --git a/test-env/build.sh b/test-env/build.sh new file mode 100755 index 0000000..3325084 --- /dev/null +++ b/test-env/build.sh @@ -0,0 +1,8 @@ +#!/bin/bash + + +# Compile the source +docker build -t mistox-sql ../database + +# Start the servers +docker compose up -d --force-recreate --remove-orphans \ No newline at end of file diff --git a/test-env/docker-compose.yml b/test-env/docker-compose.yml new file mode 100755 index 0000000..19bb60f --- /dev/null +++ b/test-env/docker-compose.yml @@ -0,0 +1,12 @@ +services: + + mistox-database: + container_name: mistox_database + image: mistox-sql:latest + restart: always + volumes: + - ./data:/var/lib/mysql + ports: + - 3306:3306 + environment: + MYSQL_ROOT_PASSWORD: ${MySQL_Pass} \ No newline at end of file