highperfocused/danswer
1
0
Fork 0
mirror of https://github.com/danswer-ai/danswer.git synced 2025-06-21 21:41:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make init-letsencrypt.sh use the same stack name as docs (#192)

Browse Source
This commit is contained in:
Chris Weaver 2023-07-16 16:49:13 -07:00 committed by GitHub
parent 60f05284f5
commit bc24ac53c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/docker_compose/docker-compose.dev.yml
View File

@ -94,6 +94,8 @@ services:
nginx: nginx:
image: nginx:1.23.4-alpine image: nginx:1.23.4-alpine
restart: always restart: always
# nginx will immediately crash with `nginx: [emerg] host not found in upstream`
# if api_server / web_server are not up
depends_on: depends_on:
- api_server - api_server
- web_server - web_server

5
deployment/docker_compose/docker-compose.prod.yml
View File

@ -84,6 +84,11 @@ services:
nginx: nginx:
image: nginx:1.23.4-alpine image: nginx:1.23.4-alpine
restart: always restart: always
# nginx will immediately crash with `nginx: [emerg] host not found in upstream`
# if api_server / web_server are not up
depends_on:
- api_server
- web_server
ports: ports:
- "80:80" - "80:80"
- "443:443" - "443:443"

10
deployment/docker_compose/init-letsencrypt.sh
View File

@ -36,7 +36,7 @@ fi
echo "### Creating dummy certificate for $domains ..." echo "### Creating dummy certificate for $domains ..."
path="/etc/letsencrypt/live/$domains" path="/etc/letsencrypt/live/$domains"
mkdir -p "$data_path/conf/live/$domains" mkdir -p "$data_path/conf/live/$domains"
docker compose -f docker-compose.prod.yml run --rm --entrypoint "\ docker compose -f docker-compose.prod.yml run --name danswer-stack --rm --entrypoint "\
openssl req -x509 -nodes -newkey rsa:$rsa_key_size -days 1\ openssl req -x509 -nodes -newkey rsa:$rsa_key_size -days 1\
-keyout '$path/privkey.pem' \ -keyout '$path/privkey.pem' \
-out '$path/fullchain.pem' \ -out '$path/fullchain.pem' \
@ -45,11 +45,11 @@ echo
echo "### Starting nginx ..." echo "### Starting nginx ..."
docker compose -f docker-compose.prod.yml up --force-recreate -d nginx docker compose -f docker-compose.prod.yml -p danswer-stack up --force-recreate -d nginx
echo echo
echo "### Deleting dummy certificate for $domains ..." echo "### Deleting dummy certificate for $domains ..."
docker compose -f docker-compose.prod.yml run --rm --entrypoint "\ docker compose -f docker-compose.prod.yml run --name danswer-stack --rm --entrypoint "\
rm -Rf /etc/letsencrypt/live/$domains && \ rm -Rf /etc/letsencrypt/live/$domains && \
rm -Rf /etc/letsencrypt/archive/$domains && \ rm -Rf /etc/letsencrypt/archive/$domains && \
rm -Rf /etc/letsencrypt/renewal/$domains.conf" certbot rm -Rf /etc/letsencrypt/renewal/$domains.conf" certbot
@ -72,7 +72,7 @@ esac
# Enable staging mode if needed # Enable staging mode if needed
if [ $staging != "0" ]; then staging_arg="--staging"; fi if [ $staging != "0" ]; then staging_arg="--staging"; fi
docker compose -f docker-compose.prod.yml run --rm --entrypoint "\ docker compose -f docker-compose.prod.yml run --name danswer-stack --rm --entrypoint "\
certbot certonly --webroot -w /var/www/certbot \ certbot certonly --webroot -w /var/www/certbot \
$staging_arg \ $staging_arg \
$email_arg \ $email_arg \
@ -83,4 +83,4 @@ docker compose -f docker-compose.prod.yml run --rm --entrypoint "\
echo echo
echo "### Reloading nginx ..." echo "### Reloading nginx ..."
docker compose -f docker-compose.prod.yml exec nginx nginx -s reload docker compose -f docker-compose.prod.yml -p danswer-stack up --force-recreate -d nginx