Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Suppression des références au module d'export legacy #1191

Merged
merged 1 commit into from
Jan 22, 2025
Merged
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ npm run dev
```

L'[interface web de Stylo](./front) est alors disponible sur ([`localhost:3000`](http://localhost:3000)).<br>
L'[API](./graphql) fonctionne sur [`localhost:3030`](http://localhost:3030/) et le [service d'export](./export) sur [`localhost:3060`](http://localhost:3060/).
L'[API GraphQL](./graphql) fonctionne sur [`localhost:3030`](http://localhost:3030/) et le [service d'export](./export) sur [`localhost:3080`](http://localhost:3080/).

# Installation

Expand Down
2 changes: 1 addition & 1 deletion graphql/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module.exports = convict({
baseUrl: {
format: String,
env: 'SNOWPACK_PUBLIC_ANNOTATIONS_CANONICAL_BASE_URL',
default: 'http://127.0.0.1:3060',
default: 'https://stylo.ecrituresnumeriques.ca',
},
urlEndpoint: {
format: 'url',
Expand Down
23 changes: 0 additions & 23 deletions infrastructure/files/stylo-dev.huma-num.fr.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ upstream graphql_stylo {
server 127.0.0.1:3030;
}

upstream export_stylo {
server 127.0.0.1:3060;
}

server {
server_name stylo-dev.huma-num.fr;

Expand Down Expand Up @@ -75,25 +71,6 @@ server {
proxy_pass http://graphql_stylo;
proxy_redirect off;
}

location ~ ^/export|api|htmlBook/ {
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header Host $host;
proxy_set_header X-NginX-Proxy true;

proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";

proxy_buffer_size 128k;
proxy_buffers 4 256k;
proxy_busy_buffers_size 256k;

proxy_pass http://export_stylo;
proxy_redirect off;
}
}

server {
Expand Down
18 changes: 0 additions & 18 deletions infrastructure/files/stylo.ecrituresnumeriques.ca.conf
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,6 @@ server {
ssl_ciphers "ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS";
ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;

location ~ ^/export|api|htmlBook/ {
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $http_host;
proxy_set_header X-NginX-Proxy true;

proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";

proxy_buffer_size 128k;
proxy_buffers 4 256k;
proxy_busy_buffers_size 256k;

proxy_pass http://export_stylo;
proxy_redirect off;
}

location / {
return 301 https://stylo.huma-num.fr;
}
Expand Down
23 changes: 0 additions & 23 deletions infrastructure/files/stylo.huma-num.fr.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ upstream graphql_stylo {
server 127.0.0.1:3030;
}

upstream export_stylo {
server 127.0.0.1:3060;
}

server {
server_name stylo.huma-num.fr;

Expand Down Expand Up @@ -75,25 +71,6 @@ server {
proxy_pass http://graphql_stylo;
proxy_redirect off;
}

location ~ ^/export|api|htmlBook/ {
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header Host $host;
proxy_set_header X-NginX-Proxy true;

proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";

proxy_buffer_size 128k;
proxy_buffers 4 256k;
proxy_busy_buffers_size 256k;

proxy_pass http://export_stylo;
proxy_redirect off;
}
}


Expand Down
Loading