From c6f05f748327ebf3548771e01dcf38359d70d3e9 Mon Sep 17 00:00:00 2001
From: Alexander Chaika <manti.by@gmail.com>
Date: Tue, 19 Mar 2024 08:34:13 +0000
Subject: [PATCH] Update server config

---
 .gitignore         |  2 ++
 Makefile           | 21 ++++++---------------
 config/nginx.conf  | 10 +++++-----
 docker-compose.yml |  8 ++++----
 4 files changed, 17 insertions(+), 24 deletions(-)

diff --git a/.gitignore b/.gitignore
index f09dc64..8c87027 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,5 @@ data/
 
 *.pyc
 *~
+
+database.sql
diff --git a/Makefile b/Makefile
index a8c90cb..adcf8d0 100644
--- a/Makefile
+++ b/Makefile
@@ -13,21 +13,12 @@ bash:
 send_email:
 	docker exec -it semkov-wagtail python manage.py send_email
 
-update-project:
-	ssh amon-ra "docker exec -i semkov-postgres pg_dump -U semkov -d semkov > /mnt/nostromo/www/semkov/data/semkov.sql"
-	scp -r amon-ra:/mnt/nostromo/www/semkov/media .
-	scp -r amon-ra:/mnt/nostromo/www/semkov/data .
-	export PGPASSWORD=semkov && psql -h localhost -U semkov semkov -c "drop database semkov; create database semkov;"
-	export PGPASSWORD=semkov && psql -h localhost -U semkov semkov -f ./data/semkov.sql
-
-update-server:
-	export PGPASSWORD=semkov && pg_dump -h localhost -U semkov -d semkov > ./data/semkov.sql
-	scp -r ./media/ amon-ra:/mnt/nostromo/www/semkov/
-	scp -r ./data/ amon-ra:/mnt/nostromo/www/semkov/
-	ssh amon-ra "docker container stop semkov-postgres && docker container rm semkov-postgres"
-	ssh amon-ra "cd ~/www/semkov-gorodok.by/ && docker-compose up -d"
-	ssh amon-ra "docker cp /mnt/nostromo/www/semkov/data/semkov.sql semkov-postgres:/tmp/semkov.sql"
-	ssh amon-ra "docker exec -it semkov-postgres psql -U semkov semkov -f /tmp/semkov.sql"
+dump:
+	docker exec -it semkov-postgres pg_dump -U semkov -d semkov > database.sql
+
+restore:
+	docker cp database.sql semkov-postgres:/tmp/database.sql
+	docker exec -it semkov-postgres psql -U semkov semkov -f /tmp/database.sql
 
 update-requirements:
 	pcu requirements.txt -u
diff --git a/config/nginx.conf b/config/nginx.conf
index 6b902ea..e4fbdbf 100644
--- a/config/nginx.conf
+++ b/config/nginx.conf
@@ -30,11 +30,11 @@ server {
     charset utf-8;
     client_max_body_size 10M;
 
-    access_log /mnt/nostromo/www/semkov/log/nginx_access.log;
-    error_log /mnt/nostromo/www/semkov/log/nginx_error.log;
+    access_log /mnt/data/www/semkov/log/nginx_access.log;
+    error_log /mnt/data/www/semkov/log/nginx_error.log;
 
     location /(robots.txt|manifest.json|favicon.ico) {
-        root /mnt/nostromo/www/semkov/static/;
+        root /mnt/data/www/semkov/static/;
 
         expires 30d;
         access_log off;
@@ -52,7 +52,7 @@ server {
     }
 
     location /static/ {
-        alias /mnt/nostromo/www/semkov/static/;
+        alias /mnt/data/www/semkov/static/;
 
         if ($request_filename ~ "^.*/(.+\.(jpe?g|png|gif|svg|webp|json|js|css|eot|ttf|woff|woff2|ico|pdf))$") {
             expires max;
@@ -64,7 +64,7 @@ server {
     }
 
     location /media/ {
-        alias /mnt/nostromo/www/semkov/media/;
+        alias /mnt/data/www/semkov/media/;
 
         if ($request_filename ~ "^.*/(.+\.(jpe?g|png|gif|svg|webp|pdf))$") {
             expires max;
diff --git a/docker-compose.yml b/docker-compose.yml
index a2a3dd4..1b892ab 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,10 +20,10 @@ services:
       - semkov-postgres
     volumes:
       - /home/manti/www/semkov/:/srv/semkov/src/
-      - /mnt/nostromo/www/semkov/static/:/var/lib/semkov/static/
-      - /mnt/nostromo/www/semkov/media/:/var/lib/semkov/media/
-      - /mnt/nostromo/www/semkov/data/:/var/lib/semkov/data/
-      - /mnt/nostromo/www/semkov/log/:/var/log/semkov/
+      - /mnt/data/www/semkov/static/:/var/lib/semkov/static/
+      - /mnt/data/www/semkov/media/:/var/lib/semkov/media/
+      - /mnt/data/www/semkov/data/:/var/lib/semkov/data/
+      - /mnt/data/www/semkov/log/:/var/log/semkov/
     environment:
       - DJANGO_SETTINGS_MODULE=semkov.settings.prod
       - POSTGRES_HOST=semkov-postgres