proxy: fix [warn] the "listen ... http2" directive is deprecated, use…

… the "http2" directive instead
notional-labs · Jul 10, 2024 · 07d74cd · 07d74cd
1 parent 640ec03
commit 07d74cd
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 26 deletions.
diff --git a/notionalapi/proxy/nginx.conf b/notionalapi/proxy/nginx.conf
@@ -102,7 +102,8 @@ http {
     # RPC-xapikey
     server {
         listen 80;
-        listen 443 ssl http2;
+        listen 443 ssl;
+        http2 on;
         server_name ~^r-(?<chain_name>.+)--(?<xapikey>.+)\.gw\.notionalapi\.net$;
 
         proxy_hide_header 'Access-Control-Allow-Origin';
@@ -157,7 +158,8 @@ http {
     # REST/API-xapikey
     server {
         listen 80;
-        listen 443 ssl http2;
+        listen 443 ssl;
+        http2 on;
         server_name ~^a-(?<chain_name>.+)--(?<xapikey>.+)\.gw\.notionalapi\.net$;
 
         proxy_hide_header 'Access-Control-Allow-Origin';
@@ -191,8 +193,9 @@ http {
 
     # gRPC-xapikey
     server {
-        listen 9090 http2;
-        listen 443 ssl http2;
+        listen 9090;
+        listen 443 ssl;
+        http2 on;
         server_name ~^g-(?<chain_name>.+)--(?<xapikey>.+)\.gw\.notionalapi\.net$;
 
         location / {
@@ -205,7 +208,8 @@ http {
     # JSON-RPC-xapikey
     server {
         listen 80;
-        listen 443 ssl http2;
+        listen 443 ssl;
+        http2 on;
         server_name ~^j-(?<chain_name>.+)--(?<xapikey>.+)\.gw\.notionalapi\.net$;
 
         proxy_hide_header 'Access-Control-Allow-Origin';

diff --git a/proxy/internal/nginx.conf b/proxy/internal/nginx.conf
@@ -91,7 +91,8 @@ http {
 #        grpc_ssl_server_name off;
 
     server {
-        listen 443 ssl http2;
+        listen 443 ssl;
+        http2 on;
         server_name default.internalendpoints.$USE_DOMAIN_NAME;
 
         location / {

diff --git a/proxy/internal/run.sh b/proxy/internal/run.sh
@@ -77,7 +77,8 @@ for service_name in $SERVICES; do
     # RPC
     server {
         listen 80;
-        listen 443 ssl http2;
+        listen 443 ssl;
+        http2 on;
         server_name rpc-${service_with_token}-ie.internalendpoints.$USE_DOMAIN_NAME;
         $HEADER_CORS
         location ~* ^/(.*) {
@@ -95,7 +96,8 @@ EOT
     # REST/API
     server {
         listen 80;
-        listen 443 ssl http2;
+        listen 443 ssl;
+        http2 on;
         server_name api-${service_with_token}-ie.internalendpoints.$USE_DOMAIN_NAME;
         $HEADER_CORS
         location ~* ^/(.*) {
@@ -112,8 +114,9 @@ EOT
   cat <<EOT >> /etc/nginx/endpoints.conf
     # gRPC
     server {
-        listen 9090 http2;
-        listen 443 ssl http2;
+        listen 9090;
+        listen 443 ssl;
+        http2 on;
         server_name grpc-${service_with_token}-ie.internalendpoints.$USE_DOMAIN_NAME;
 
         location / {
@@ -138,7 +141,8 @@ for service_name in $SERVICES_SUBNODE; do
     # RPC
     server {
         listen 80;
-        listen 443 ssl http2;
+        listen 443 ssl;
+        http2 on;
         server_name rpc-${service_with_token}-sub.internalendpoints.$USE_DOMAIN_NAME;
         $HEADER_CORS
         location ~* ^/(.*) {
@@ -156,7 +160,8 @@ EOT
     # REST/API
     server {
         listen 80;
-        listen 443 ssl http2;
+        listen 443 ssl;
+        http2 on;
         server_name api-${service_with_token}-sub.internalendpoints.$USE_DOMAIN_NAME;
         $HEADER_CORS
         location ~* ^/(.*) {
@@ -173,8 +178,9 @@ EOT
   cat <<EOT >> /etc/nginx/endpoints.conf
     # gRPC
     server {
-        listen 9090 http2;
-        listen 443 ssl http2;
+        listen 9090;
+        listen 443 ssl;
+        http2 on;
         server_name grpc-${service_with_token}-sub.internalendpoints.$USE_DOMAIN_NAME;
 
         location / {
@@ -189,7 +195,8 @@ EOT
       # JSON-RPC
       server {
           listen 80;
-          listen 443 ssl http2;
+          listen 443 ssl;
+          http2 on;
           server_name jsonrpc-${service_with_token}-sub.internalendpoints.$USE_DOMAIN_NAME;
           $HEADER_CORS
 
@@ -232,7 +239,8 @@ for service_name in $SERVICES_JSONRPC; do
     # JSON-RPC
     server {
         listen 80;
-        listen 443 ssl http2;
+        listen 443 ssl;
+        http2 on;
         server_name jsonrpc-${service_with_token}-ie.internalendpoints.$USE_DOMAIN_NAME;
         $HEADER_CORS
 

diff --git a/proxy/public/nginx.conf b/proxy/public/nginx.conf
@@ -90,7 +90,8 @@ http {
     # RPC
     server {
         listen 80;
-        listen 443 ssl http2;
+        listen 443 ssl;
+        http2 on;
         server_name ~^rpc-(?<chain_name>.+)-ia\.cosmosia\.notional\.ventures$;
 
         proxy_hide_header 'Access-Control-Allow-Origin';
@@ -151,7 +152,8 @@ http {
     # REST/API
     server {
         listen 80;
-        listen 443 ssl http2;
+        listen 443 ssl;
+        http2 on;
         server_name ~^api-(?<chain_name>.+)-ia\.cosmosia\.notional\.ventures$;
 
         proxy_hide_header 'Access-Control-Allow-Origin';
@@ -184,8 +186,9 @@ http {
 
     # gRPC
     server {
-        listen 9090 http2;
-        listen 443 ssl http2;
+        listen 9090;
+        listen 443 ssl;
+        http2 on;
         server_name ~^grpc-(?<chain_name>.+)-ia\.cosmosia\.notional\.ventures$;
 
         location / {
@@ -197,7 +200,8 @@ http {
     # JSON-RPC
     server {
         listen 80;
-        listen 443 ssl http2;
+        listen 443 ssl;
+        http2 on;
         server_name ~^jsonrpc-(?<chain_name>.+)-ia\.cosmosia\.notional\.ventures$;
 
         proxy_hide_header 'Access-Control-Allow-Origin';
@@ -262,7 +266,8 @@ http {
     # RPC
     server {
         listen 80;
-        listen 443 ssl http2;
+        listen 443 ssl;
+        http2 on;
         server_name ~^rpc-(?<chain_name>.+)-sub\.cosmosia\.notional\.ventures$;
 
         proxy_hide_header 'Access-Control-Allow-Origin';
@@ -304,7 +309,8 @@ http {
     # REST/API
     server {
         listen 80;
-        listen 443 ssl http2;
+        listen 443 ssl;
+        http2 on;
         server_name ~^api-(?<chain_name>.+)-sub\.cosmosia\.notional\.ventures$;
 
         proxy_hide_header 'Access-Control-Allow-Origin';
@@ -337,8 +343,9 @@ http {
 
     # gRPC
     server {
-        listen 9090 http2;
-        listen 443 ssl http2;
+        listen 9090;
+        listen 443 ssl;
+        http2 on;
         server_name ~^grpc-(?<chain_name>.+)-sub\.cosmosia\.notional\.ventures$;
 
         location / {
@@ -350,7 +357,8 @@ http {
     # JSON-RPC
     server {
         listen 80;
-        listen 443 ssl http2;
+        listen 443 ssl;
+        http2 on;
         server_name ~^jsonrpc-(?<chain_name>.+)-sub\.cosmosia\.notional\.ventures$;
 
         proxy_hide_header 'Access-Control-Allow-Origin';