Compare commits

..

3 Commits

3 changed files with 5 additions and 9 deletions

6
.env
View File

@@ -1,8 +1,8 @@
DATABASE = mia_dev
DATABASE_HOST = db.thecoredev.fr
DATABASE_HOST = nas.thecoredev.fr
DATABASE_PORT = 3306
DATABASE_USER = mia
DATABASE_PASSWORD = CalomOk0t-ISvpw-
MASTER_URL = 'https://slave.thecoredev.fr'
SLAVE_URL = 'https://slave.thecoredev.fr'
MASTER_URL = 'https://master.projetmia.fr'
SLAVE_URL = 'https://slave.projetmia.fr'

View File

@@ -4,5 +4,5 @@ DATABASE_PORT = 3306
DATABASE_USER = mia
DATABASE_PASSWORD = CalomOk0t-ISvpw-
MASTER_URL = 'https://slave.thecoredev.fr'
SLAVE_URL = 'https://slave.thecoredev.fr'
MASTER_URL = 'https://master.projetmia.fr'
SLAVE_URL = 'https://slave.projetmia.fr'

View File

@@ -5,11 +5,7 @@
"main": "mia_ihm.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
<<<<<<< HEAD
"start": "nodemon app.js"
=======
"start": "nodemon mia_ihm.js"
>>>>>>> master
},
"author": "Laurent LE CORRE",
"license": "ISC",