diff --git a/debian/ogcore.postinst b/debian/ogcore.postinst index 8a88cda..9e98638 100644 --- a/debian/ogcore.postinst +++ b/debian/ogcore.postinst @@ -42,6 +42,7 @@ if [ "$1" = "configure" ] && [ -z "$2" ]; then echo ">>> Configurando servidor web y servicios" ln -s /opt/opengnsys/ogcore/etc/nginx/sites-available/ogcore.conf /etc/nginx/sites-enabled/ogcore.conf + ln -s /opt/opengnsys/ogcore/etc/nginx/sites-available/mercure.conf /etc/nginx/sites-enabled/mercure.conf ln -s /opt/opengnsys/ogcore/etc/php/8.3/fpm/pool.d/ogcore-fpm.conf /etc/php/8.3/fpm/pool.d/ogcore-fpm.conf ln -s /opt/opengnsys/ogcore/etc/systemd/system/og-mercure.service /etc/systemd/system/og-mercure.service diff --git a/etc/mercure/mercure-og.env b/etc/mercure/mercure-og.env index e8ef51e..63cf42e 100644 --- a/etc/mercure/mercure-og.env +++ b/etc/mercure/mercure-og.env @@ -1,4 +1,4 @@ -SERVER_NAME=":3000" +SERVER_NAME=":3001" MERCURE_PUBLISHER_JWT_KEY="!ChangeThisMercureHubJWTSecretKey!" MERCURE_SUBSCRIBER_JWT_KEY="!ChangeThisMercureHubJWTSecretKey!" MERCURE_EXTRA_DIRECTIVES="cors_origins *" diff --git a/etc/nginx/sites-available/mercure.conf b/etc/nginx/sites-available/mercure.conf new file mode 100644 index 0000000..bd4ebec --- /dev/null +++ b/etc/nginx/sites-available/mercure.conf @@ -0,0 +1,23 @@ +server { + listen 3000 ssl http2; + listen [::]:3000 ssl http2; + + + ssl_certificate /opt/opengnsys/ogcore/etc/nginx/certs/ogcore.uds-test.net.crt.pem; + ssl_certificate_key /opt/opengnsys/ogcore/etc/nginx/certs/ogcore.uds-test.net.key.pem; + + location / { + proxy_pass http://localhost:3001/; + proxy_read_timeout 24h; + proxy_http_version 1.1; + proxy_set_header Connection ""; + + # Enable fast reply in SSE + proxy_buffering off; + + ## Be sure to set USE_FORWARDED_HEADERS=1 to allow the hub to use those headers ## + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Host $host; + proxy_set_header X-Forwarded-Proto $scheme; + } +} \ No newline at end of file diff --git a/etc/nginx/sites-available/ogcore.conf b/etc/nginx/sites-available/ogcore.conf index 46a3e51..031ae72 100644 --- a/etc/nginx/sites-available/ogcore.conf +++ b/etc/nginx/sites-available/ogcore.conf @@ -31,21 +31,6 @@ server { location ~ \.php$ { return 404; } - location /mercure/ { - proxy_pass http://ogcore-mercure:3000/; - proxy_read_timeout 24h; - proxy_http_version 1.1; - proxy_set_header Connection ""; - - # Enable fast reply in SSE - proxy_buffering off; - - ## Be sure to set USE_FORWARDED_HEADERS=1 to allow the hub to use those headers ## - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Host $host; - proxy_set_header X-Forwarded-Proto $scheme; - } - error_log /var/log/nginx/ogcore-error.log; access_log /var/log/nginx/ogcore-access.log; }