From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 26 Oct 2017 12:57:53 +0000 (+0000)
Subject: Fix ports and various settings
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=17f787e963a3c68e3ed7fe7e12add3eb0e015ac7;p=diggersdigest.git

Fix ports and various settings
---

diff --git a/app/deploy/nginx-app.conf b/app/deploy/nginx-app.conf
index df8bc0a..f4db2e7 100644
--- a/app/deploy/nginx-app.conf
+++ b/app/deploy/nginx-app.conf
@@ -2,7 +2,7 @@ server_tokens off;
 
 server {
        listen 80;
-       server_name nginx;
+       server_name nginx www.diggersdigest.com diggersdigest.com;
        charset utf-8;
 
        access_log /var/log/nginx/app-access.log;
@@ -14,12 +14,12 @@ server {
        # Django media
        location /media {
        	        alias /opt/media; # your Django project's media files - amend as required
-                autoindex on;
+                #autoindex on;
        }
        # Django static
        location /static {
                alias /opt/static; # your Django project's static files - amend as required
-               autoindex on;
+               #autoindex on;
        }
 
        location / {
diff --git a/app/diggersdigest/local_settings.py b/app/diggersdigest/local_settings.py
index b4b08bd..ceadb91 100644
--- a/app/diggersdigest/local_settings.py
+++ b/app/diggersdigest/local_settings.py
@@ -9,8 +9,8 @@ DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.mysql',
         'NAME': 'diggersdigest',
-        'USER': 'digger',
-        'PASSWORD': 'admin',
+        'USER': 'root',
+        'PASSWORD': 'ejkinBukdin1',
         'HOST': 'db',
         'PORT': 3306,
     }
diff --git a/docker-compose.yml b/docker-compose.yml
index 1df5044..574da6a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,8 +10,8 @@ db:
   environment:
     - MYSQL_ROOT_PASSWORD=mysecretpassword
     - MYSQL_DATABASE=diggersdigest
-    - MYSQL_USER=digger
-    - MYSQL_PASSWORD=admin
+    - MYSQL_USER=root
+    - MYSQL_PASSWORD=ejkinBukdin1
   volumes:
     - ./mysql/:/var/lib/mysql
 
@@ -22,15 +22,13 @@ app:
     - ./app/:/opt/app
   volumes_from:
     - media
-  ports:
-    - "8000:8000"
   links:
     - db
 
 nginx:
   image: nginx
   ports:
-    - "80:80"
+    - "8001:80"
   volumes:
     - ./app/deploy/nginx-app.conf:/etc/nginx/conf.d/default.conf
     - ./log/:/var/log/nginx