From 9c8e5d8ac4a1995bd3331ae4c60447dc54ac0c68 Mon Sep 17 00:00:00 2001
From: Ilya Mukhortov <ilya.muhortov@gmail.com>
Date: Sat, 23 Mar 2024 14:35:00 +1000
Subject: [PATCH] pass

---
 bash_scripts/install-remd.sh     | 14 ++++++++++++++
 medicine-remd/.env_example       |  1 -
 medicine-remd/docker-compose.yml | 15 +++------------
 medicine-remd/install.sh         |  7 -------
 medicine/env.sample              | 18 ------------------
 5 files changed, 17 insertions(+), 38 deletions(-)
 delete mode 100644 medicine-remd/.env_example
 delete mode 100755 medicine-remd/install.sh
 delete mode 100644 medicine/env.sample

diff --git a/bash_scripts/install-remd.sh b/bash_scripts/install-remd.sh
index bf55104..0b5a8ab 100755
--- a/bash_scripts/install-remd.sh
+++ b/bash_scripts/install-remd.sh
@@ -7,6 +7,20 @@ docker pull docker.med-logic.ru/medicine-remd:latest
 cd /root/medicine-config/medicine-stack
 docker-compose exec postgres psql -c 'CREATE DATABASE medicine_remd' --username=postgres
 
+read -p "Enter organization name: " ORGANIZATION_NAME
+
+SECRET_KEY=$(openssl rand -base64 32)
+
+cat <<EOT >> /root/medicine-config/medicine-remd/.env
+
+SECRET_KEY=$SECRET_KEY
+
+SENTRY_ENABLED='True'
+
+SENTRY_SERVER_NAME=$ORGANIZATION_NAME
+
+EOT
+
 cd /root/medicine-config/medicine-remd
 docker-compose run --rm medicine-remd python manage.py migrate
 docker-compose run --rm medicine-remd python manage.py post_install
diff --git a/medicine-remd/.env_example b/medicine-remd/.env_example
deleted file mode 100644
index 46932bb..0000000
--- a/medicine-remd/.env_example
+++ /dev/null
@@ -1 +0,0 @@
-SENTRY_SERVER_NAME=
diff --git a/medicine-remd/docker-compose.yml b/medicine-remd/docker-compose.yml
index 617dfbd..94a91ca 100644
--- a/medicine-remd/docker-compose.yml
+++ b/medicine-remd/docker-compose.yml
@@ -8,24 +8,15 @@ services:
     environment:
       UWSGI_PROCESSES: 2
       UWSGI_THREADS: 2
-      SUPERVISOR_HTTP_USERNAME: user
-      SUPERVISOR_HTTP_PASSWORD: password
-      SECRET_KEY: 26km5gdji3qd0*#cj3rt1lj47)+2a2eoacl@2aj+7ngc8vjb
-      POSTGRES_HOST: postgres-host
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: password
-      POSTGRES_DB: medicine_remd
-      REDIS_HOST: redis-host
-      CACHE_REDIS_DB: 10
-      CELERY_REDIS_DB: 11
-      SENTRY_ENABLED: 'True'
+      SECRET_KEY: ${SECRET_KEY}
+      SENTRY_ENABLED: ${SENTRY_ENABLED}
       SENTRY_SERVER_NAME: ${SENTRY_SERVER_NAME}
     security_opt:
       - seccomp:unconfined
     ports:
       - "870:80"
     volumes:
-      - ./volumes/public:/app/public
+      - ./public:/app/public
     networks:
       - medicine-network
     extra_hosts:
diff --git a/medicine-remd/install.sh b/medicine-remd/install.sh
deleted file mode 100755
index 0e6e625..0000000
--- a/medicine-remd/install.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-docker exec -i medicine-stack-postgres psql -c 'CREATE DATABASE medicine_remd' --username=postgres
-echo "readonly" | docker login docker.med-logic.ru --username readonly --password-stdin
-docker pull docker.med-logic.ru/medicine-remd:latest
-docker-compose run --rm medicine-remd python manage.py post_install
-docker-compose up -d
diff --git a/medicine/env.sample b/medicine/env.sample
deleted file mode 100644
index 795b52c..0000000
--- a/medicine/env.sample
+++ /dev/null
@@ -1,18 +0,0 @@
-
-SECRET_KEY='%9nu_z5s&x*2_m8eb@r!0_sl@xat^8duh81xb$3-9un1853+^u'
-
-SENTRY_SITE="Название организации"
-
-SESSION_COOKIE_NAME=sessionid_medicine
-
-NGINX_PORT=80
-
-NGINX_HTTPS_PORT=443
-
-UWSGI_PROCESSES=4
-
-UWSGI_THREADS=2
-
-POSTGRES_HOST=medicine-stack-postgres
-
-REDIS_HOST=medicine-stack-redis