Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ jobs:
run: |
echo "127.0.0.1 dev.squarelet.com" | sudo tee -a /etc/hosts
echo "127.0.0.1 dev.mailhog.com" | sudo tee -a /etc/hosts
echo "127.0.0.1 minio.documentcloud.org" | sudo tee -a /etc/hosts

- name: Generate environment files
run: python initialize_dotenvs.py
Expand All @@ -53,7 +54,7 @@ jobs:
-keyout config/certs/dev.squarelet.com-key.pem \
-out config/certs/dev.squarelet.com.pem \
-subj "/CN=dev.squarelet.com" \
-addext "subjectAltName=DNS:dev.squarelet.com,DNS:*.dev.documentcloud.org,DNS:dev.muckrock.com,DNS:dev.foiamachine.org,DNS:dev.mailhog.com"
-addext "subjectAltName=DNS:dev.squarelet.com,DNS:*.dev.documentcloud.org,DNS:dev.muckrock.com,DNS:dev.foiamachine.org,DNS:dev.mailhog.com,DNS:minio.documentcloud.org"

- name: Build and start services
run: docker compose -f local.yml up -d --build
Expand Down
15 changes: 14 additions & 1 deletion compose/local/nginx/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,23 @@ http {

server {
listen *:443 ssl;
server_name ~^(.*)$;
server_name minio.documentcloud.org;
ssl_certificate /etc/nginx/certs/dev.squarelet.com.pem;
ssl_certificate_key /etc/nginx/certs/dev.squarelet.com-key.pem;
client_max_body_size 500M;
location / {
set $minio_upstream http://minio.documentcloud.org:9000;
proxy_set_header X-Forwarded-Proto https;
proxy_set_header Host $http_host;
proxy_pass $minio_upstream;
}
}

server {
listen *:443 ssl;
server_name ~^(.*)$;
ssl_certificate /etc/nginx/certs/dev.squarelet.com.pem;
ssl_certificate_key /etc/nginx/certs/dev.squarelet.com-key.pem;
location / {
proxy_set_header X-Forwarded-Proto https;
proxy_set_header Host $http_host;
Expand Down
1 change: 1 addition & 0 deletions local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ services:
- www.dev.documentcloud.org
- dev.muckrock.com
- dev.foiamachine.org
- minio.documentcloud.org

squarelet_mailhog:
image: mailhog/mailhog:v1.0.0
Expand Down
3 changes: 2 additions & 1 deletion tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -391,5 +391,6 @@ def mkcert(c):
'"*.dev.documentcloud.org" '
"dev.muckrock.com "
"dev.foiamachine.org "
"dev.mailhog.com"
"dev.mailhog.com "
"minio.documentcloud.org"
)
Loading