Merge pull request #1191 from EcrituresNumeriques/fix/api-nginx

EcrituresNumeriques · Jan 22, 2025 · c485eb2 · c485eb2
2 parents bbdf148 + 9b7618a
commit c485eb2
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 66 deletions.
diff --git a/README.md b/README.md
@@ -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
 

diff --git a/graphql/config.js b/graphql/config.js
@@ -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',

diff --git a/infrastructure/files/stylo-dev.huma-num.fr.conf b/infrastructure/files/stylo-dev.huma-num.fr.conf
@@ -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;
 
@@ -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 {

diff --git a/infrastructure/files/stylo.ecrituresnumeriques.ca.conf b/infrastructure/files/stylo.ecrituresnumeriques.ca.conf
@@ -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;
   }

diff --git a/infrastructure/files/stylo.huma-num.fr.conf b/infrastructure/files/stylo.huma-num.fr.conf
@@ -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;
 
@@ -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;
-  }
 }