From 961f9ac950d77f3cb2aa1a0e1759e34e99f02243 Mon Sep 17 00:00:00 2001
From: Mikhail Lavkin <mlavkin@gmail.com>
Date: Wed, 4 Jul 2018 18:55:47 +0000
Subject: [PATCH] Ci get prod db

---
 .gitlab-ci.yml                                         |  4 +++-
 .../{sites-available/default => conf.d/default.conf}   | 10 ++++++++++
 docker/conf/nginx/nginx.conf                           |  1 -
 docker/conf/nginx/sites-enabled/default                |  1 -
 4 files changed, 13 insertions(+), 3 deletions(-)
 rename docker/conf/nginx/{sites-available/default => conf.d/default.conf} (71%)
 delete mode 120000 docker/conf/nginx/sites-enabled/default

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3d4ff10c..1d78b5d1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -57,8 +57,10 @@ prod-db:
   script:
     - export REVIEW_HOST=$CI_COMMIT_REF_SLUG-$REVIEW_DOMAIN
     - cd docker
+    - cp .env.review .env
     - docker-compose -f docker-compose-review.yml -p back$CI_COMMIT_REF_NAME restart db
-    - echo 'DROP DATABASE IF EXISTS lilcity; CREATE DATABASE lilcity' | docker-compose -f docker-compose-review.yml -p back$CI_COMMIT_REF_NAME exec -T -u postgres postgres psql postgres
+    - echo 'DROP DATABASE IF EXISTS lilcity; CREATE DATABASE lilcity' | docker-compose -f docker-compose-review.yml -p back$CI_COMMIT_REF_NAME exec -T -u postgres db psql postgres
+    - /work/scripts/get_prod_db.sh | docker-compose -f docker-compose-review.yml -p back$CI_COMMIT_REF_NAME exec -T -u postgres db psql lilcity
   when: manual
   only:
     - branches
diff --git a/docker/conf/nginx/sites-available/default b/docker/conf/nginx/conf.d/default.conf
similarity index 71%
rename from docker/conf/nginx/sites-available/default
rename to docker/conf/nginx/conf.d/default.conf
index 1aaa7519..b20174f6 100644
--- a/docker/conf/nginx/sites-available/default
+++ b/docker/conf/nginx/conf.d/default.conf
@@ -19,9 +19,19 @@ server {
 
 	    location /media/instagram/results/ {
 		expires 1d;
+		try_files $uri @prod;
 	    }
+	    try_files $uri @prod;
 	}
 
+	location @prod {
+	    if ($host = "lil.school") {
+		return 404;
+	    }
+	    proxy_pass https://lil.school;
+	    proxy_buffering off;
+	}	
+
 	location / {
 	    try_files $uri @django;
 	}
diff --git a/docker/conf/nginx/nginx.conf b/docker/conf/nginx/nginx.conf
index c477630e..2889f7ad 100644
--- a/docker/conf/nginx/nginx.conf
+++ b/docker/conf/nginx/nginx.conf
@@ -26,7 +26,6 @@ http {
 	gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
 
 	include /etc/nginx/conf.d/*.conf;
-	include /etc/nginx/sites-enabled/*;
 	
 	set_real_ip_from  192.168.0.0/24;
 }
diff --git a/docker/conf/nginx/sites-enabled/default b/docker/conf/nginx/sites-enabled/default
deleted file mode 120000
index ad35b834..00000000
--- a/docker/conf/nginx/sites-enabled/default
+++ /dev/null
@@ -1 +0,0 @@
-/etc/nginx/sites-available/default
\ No newline at end of file