Skip to content

update nginx to version 1.31.1#710

Open
mishaschwartz wants to merge 2 commits into
masterfrom
bump-nginx
Open

update nginx to version 1.31.1#710
mishaschwartz wants to merge 2 commits into
masterfrom
bump-nginx

Conversation

@mishaschwartz
Copy link
Copy Markdown
Collaborator

@mishaschwartz mishaschwartz commented Jun 1, 2026

Overview

This update includes:

  • a fix for CVE-2026-9256
  • traffic is now routed to upstream servers with HTTP/1.1 and with keep-alive enabled by default.
  • The ssl on; directive is no longer supported (replaced with listen 443 ssl;)
  • The listen 443 http2 directive is no longer supported (replaced with http2 on;)

Changes

Non-breaking changes

  • New component version nginx:1.31.1

Breaking changes

Related Issue / Discussion

Additional Information

CI Operations

birdhouse_daccs_configs_branch: master
birdhouse_skip_ci: false

@github-actions github-actions Bot added the documentation Improvements or additions to documentation label Jun 1, 2026
@crim-jenkins-bot
Copy link
Copy Markdown
Collaborator

E2E Test Results

DACCS-iac Pipeline Results

Build URL : http://daccs-jenkins.crim.ca:80/job/DACCS-iac-birdhouse/4308/
Result 🆘 ABORTED

BIRDHOUSE_DEPLOY_BRANCH : bump-nginx
DACCS_IAC_BRANCH : master
DACCS_CONFIGS_BRANCH : master
PAVICS_E2E_WORKFLOW_TESTS_BRANCH : master
PAVICS_SDI_BRANCH : master

DESTROY_INFRA_ON_EXIT : true
PAVICS_HOST : https://host-140-154.rdext.crim.ca

⚠️ Infrastructure deployment failed. ⚠️
Instance destroyed due to CI execution.
To debug, launch an instance manually with PR reference
bump-nginx.

Copy link
Copy Markdown
Collaborator

@tlvu tlvu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@fmigneault
Copy link
Copy Markdown
Member

run tests

Copy link
Copy Markdown
Member

@fmigneault fmigneault left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good by itself,
Waiting on the re-triggered CI tests to check if failure was sporadic or an actual problem.

@crim-jenkins-bot
Copy link
Copy Markdown
Collaborator

E2E Test Results

DACCS-iac Pipeline Results

Build URL : http://daccs-jenkins.crim.ca:80/job/DACCS-iac-birdhouse/4315/
Result 🆘 ABORTED

BIRDHOUSE_DEPLOY_BRANCH : bump-nginx
DACCS_IAC_BRANCH : master
DACCS_CONFIGS_BRANCH : master
PAVICS_E2E_WORKFLOW_TESTS_BRANCH : master
PAVICS_SDI_BRANCH : master

DESTROY_INFRA_ON_EXIT : true
PAVICS_HOST : https://host-140-154.rdext.crim.ca

⚠️ Infrastructure deployment failed. ⚠️
Instance destroyed due to CI execution.
To debug, launch an instance manually with PR reference
bump-nginx.

@crim-jenkins-bot
Copy link
Copy Markdown
Collaborator

E2E Test Results

DACCS-iac Pipeline Results

Build URL : http://daccs-jenkins.crim.ca:80/job/DACCS-iac-birdhouse/4318/
Result 🆘 ABORTED

BIRDHOUSE_DEPLOY_BRANCH : bump-nginx
DACCS_IAC_BRANCH : master
DACCS_CONFIGS_BRANCH : master
PAVICS_E2E_WORKFLOW_TESTS_BRANCH : master
PAVICS_SDI_BRANCH : master

DESTROY_INFRA_ON_EXIT : false
PAVICS_HOST : https://host-140-133.rdext.crim.ca

⚠️ Infrastructure deployment failed. ⚠️
Instance destroyed due to CI execution.
To debug, launch an instance manually with PR reference
bump-nginx.

@fmigneault
Copy link
Copy Markdown
Member

@mishaschwartz
Is it working on your end?
The CI is showing errors like the following:

service thredds is required by proxy but is disabled. Can be enabled by profiles []

service cowbird is required by proxy but is disabled. Can be enabled by profiles []

INFO:     [Weaver] Wait for response from Magpie to login [https://host-140-133.rdext.crim.ca/magpie]...........................................................ERROR:    [Weaver] Timeout (120s)! Failed to register all providers specified in WEAVER_WPS_PROVIDERS. Magpie is not responding.

Running on current https://github.com/bird-house/birdhouse-deploy/tree/master works on the CI.

Proxy image shows this error:

2026/06/02 10:45:41 [emerg] 1#1: unknown directive "ssl" in /etc/nginx/conf.d/https.include:8
nginx: [emerg] unknown directive "ssl" in /etc/nginx/conf.d/https.include:8

Copy link
Copy Markdown
Member

@fmigneault fmigneault left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Investigate why it breaks with ssl.

@mishaschwartz
Copy link
Copy Markdown
Collaborator Author

Yes please hold off on this for a minute. There are a few syntax changes that I was going to push yesterday but time got away from me. I'll be able to update that tomorrow

@mishaschwartz mishaschwartz requested a review from fmigneault June 3, 2026 14:32

# Public (on the internet) fully qualified domain name of this Birdhouse
# Set this to "on" to enable http2 for port 443
#export PROXY_HTTP2_ON_OFF=off
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh this is a backward incompatible change !

We are currently activating http2 via PROXY_LISTEN_443_PARAMS but how this needs to be PROXY_HTTP2_ON_OFF=on?

Please update the changelog clearly with the specific config change and note it is backward incompatible.

@crim-jenkins-bot
Copy link
Copy Markdown
Collaborator

E2E Test Results

DACCS-iac Pipeline Results

Build URL : http://daccs-jenkins.crim.ca:80/job/DACCS-iac-birdhouse/4325/
ResultFAILURE

BIRDHOUSE_DEPLOY_BRANCH : bump-nginx
DACCS_IAC_BRANCH : master
DACCS_CONFIGS_BRANCH : master
PAVICS_E2E_WORKFLOW_TESTS_BRANCH : master
PAVICS_SDI_BRANCH : master

DESTROY_INFRA_ON_EXIT : true
PAVICS_HOST : https://host-140-118.rdext.crim.ca

PAVICS-e2e-workflow-tests Pipeline Results

Tests URL : http://daccs-jenkins.crim.ca:80/job/PAVICS-e2e-workflow-tests/job/master/847/

NOTEBOOK TEST RESULTS
    
[2026-06-03T14:38:44.327Z] ============================= test session starts ==============================
[2026-06-03T14:38:44.327Z] platform linux -- Python 3.12.13, pytest-9.0.3, pluggy-1.6.0
[2026-06-03T14:38:44.327Z] rootdir: /home/jenkins/agent/workspace/PAVICS-e2e-workflow-tests_master
[2026-06-03T14:38:44.328Z] plugins: xdist-3.8.0, anyio-4.13.0, nbval-0.11.0, tornasync-0.6.0.post2, typeguard-4.5.1
[2026-06-03T14:38:44.328Z] collected 618 items
[2026-06-03T14:38:44.328Z] 
[2026-06-03T14:38:52.405Z] notebooks-auth/geoserver.ipynb ..................                        [  2%]
[2026-06-03T14:39:53.121Z] notebooks-auth/test_cowbird_jupyter.ipynb ..........                     [  4%]
[2026-06-03T14:39:58.070Z] notebooks-auth/test_thredds.ipynb ...........                            [  6%]
[2026-06-03T14:41:40.132Z] pavics-sdi-master/docs/source/notebooks/CaSR_basic.ipynb ......          [  7%]
[2026-06-03T14:54:24.317Z] pavics-sdi-master/docs/source/notebooks/FAQ_dask_parallel.ipynb ..s..... [  8%]
[2026-06-03T14:55:20.600Z] .                                                                        [  8%]
[2026-06-03T14:55:32.544Z] pavics-sdi-master/docs/source/notebooks/WCS_example.ipynb ......         [  9%]
[2026-06-03T14:55:39.729Z] pavics-sdi-master/docs/source/notebooks/WFS_example.ipynb .....          [ 10%]
[2026-06-03T15:05:24.610Z] pavics-sdi-master/docs/source/notebooks/climex.ipynb ...........         [ 12%]
[2026-06-03T15:05:26.529Z] pavics-sdi-master/docs/source/notebooks/eccc-geoapi-climate-stations.ipynb . [ 12%]
[2026-06-03T15:05:33.689Z] ...............                                                          [ 14%]
[2026-06-03T15:05:44.620Z] pavics-sdi-master/docs/source/notebooks/eccc-geoapi-xclim.ipynb .....    [ 15%]
[2026-06-03T15:05:58.164Z] pavics-sdi-master/docs/source/notebooks/esgf-dap.ipynb ....              [ 16%]
[2026-06-03T15:06:15.840Z] pavics-sdi-master/docs/source/notebooks/forecasts.ipynb ......           [ 17%]
[2026-06-03T15:06:21.985Z] pavics-sdi-master/docs/source/notebooks/opendap.ipynb .......            [ 18%]
[2026-06-03T15:06:27.059Z] pavics-sdi-master/docs/source/notebooks/pavics_thredds.ipynb .....       [ 19%]
[2026-06-03T15:10:06.151Z] pavics-sdi-master/docs/source/notebooks/regridding.ipynb ............... [ 21%]
[2026-06-03T15:11:06.531Z] .............                                                            [ 23%]
[2026-06-03T15:11:13.133Z] pavics-sdi-master/docs/source/notebooks/rendering.ipynb ....             [ 24%]
[2026-06-03T15:11:14.650Z] pavics-sdi-master/docs/source/notebooks/subset-user-input.ipynb ........ [ 25%]
[2026-06-03T15:11:36.462Z] .................                                                        [ 28%]
[2026-06-03T15:11:46.121Z] pavics-sdi-master/docs/source/notebooks/subsetting.ipynb .....           [ 29%]
[2026-06-03T15:11:47.058Z] pavics-sdi-master/docs/source/notebook-components/weaver_example.ipynb . [ 29%]
[2026-06-03T15:11:58.976Z] .........                                                                [ 30%]
[2026-06-03T15:12:10.060Z] finch-main/docs/source/notebooks/dap_subset.ipynb ...........            [ 32%]
[2026-06-03T15:12:20.647Z] finch-main/docs/source/notebooks/finch-usage.ipynb ......                [ 33%]
[2026-06-03T15:12:22.554Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-1DataAccess.ipynb . [ 33%]
[2026-06-03T15:12:28.017Z] ....                                                                     [ 34%]
[2026-06-03T15:13:14.720Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-2Subsetting.ipynb . [ 34%]
[2026-06-03T15:13:42.625Z] ............                                                             [ 36%]
[2026-06-03T15:14:04.589Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-3Climate-Indicators.ipynb . [ 36%]
[2026-06-03T15:14:28.751Z] .....s                                                                   [ 37%]
[2026-06-03T15:14:36.961Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-4Ensembles.ipynb . [ 37%]
[2026-06-03T15:14:43.955Z] ..                                                                       [ 38%]
[2026-06-03T15:14:58.858Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-5Visualization.ipynb . [ 38%]
[2026-06-03T15:15:56.280Z] .........                                                                [ 39%]
[2026-06-03T15:16:11.181Z] PAVICS-landing-master/content/notebooks/climate_indicators/PAVICStutorial_ClimateDataAnalysis-6Regridding_Conversion.ipynb . [ 39%]
[2026-06-03T15:17:59.490Z] ...                                                                      [ 40%]
[2026-06-03T15:17:59.490Z] PAVICS-landing-master/content/notebooks/hydrology/PAVICStutorial_Hydrology-01_Intro.ipynb . [ 40%]
[2026-06-03T15:18:01.367Z] ....                                                                     [ 41%]
[2026-06-03T15:18:05.557Z] PAVICS-landing-master/content/notebooks/hydrology/PAVICStutorial_Hydrology-02_Calibration.ipynb . [ 41%]
[2026-06-03T15:18:15.935Z] .....                                                                    [ 42%]
[2026-06-03T15:18:20.158Z] PAVICS-landing-master/content/notebooks/hydrology/PAVICStutorial_Hydrology-03_Watershed_properties.ipynb . [ 42%]
[2026-06-03T15:18:28.597Z] .............                                                            [ 44%]
[2026-06-03T15:18:35.178Z] PAVICS-landing-master/content/notebooks/hydrology/PAVICStutorial_Hydrology-04_Time_series_analysis.ipynb . [ 44%]
[2026-06-03T15:18:35.962Z] ......                                                                   [ 45%]
[2026-06-03T15:18:46.264Z] raven-main/docs/source/notebooks/Region_selection.ipynb .........        [ 47%]
[2026-06-03T15:18:48.172Z] raven-main/docs/source/notebooks/Subset_climate_data_over_watershed.ipynb . [ 47%]
[2026-06-03T15:19:15.470Z] ......                                                                   [ 48%]
[2026-06-03T15:19:17.385Z] RavenPy-main/docs/notebooks/00_Introduction_to_JupyterLab.ipynb ......   [ 49%]
[2026-06-03T15:19:28.038Z] RavenPy-main/docs/notebooks/01_Getting_watershed_boundaries.ipynb ...... [ 50%]
[2026-06-03T15:19:28.038Z] ..                                                                       [ 50%]
[2026-06-03T15:19:34.617Z] RavenPy-main/docs/notebooks/02_Extract_geographical_watershed_properties.ipynb . [ 50%]
[2026-06-03T15:19:39.039Z] .............                                                            [ 52%]
[2026-06-03T15:20:37.361Z] RavenPy-main/docs/notebooks/03_Extracting_forcing_data.ipynb ........... [ 54%]
[2026-06-03T15:20:37.361Z]                                                                          [ 54%]
[2026-06-03T15:20:44.030Z] RavenPy-main/docs/notebooks/04_Emulating_hydrological_models.ipynb ..... [ 55%]
[2026-06-03T15:20:52.929Z] ...............                                                          [ 57%]
[2026-06-03T15:20:59.506Z] RavenPy-main/docs/notebooks/05_Advanced_RavenPy_configuration.ipynb .... [ 58%]
[2026-06-03T15:21:08.215Z] .........                                                                [ 59%]
[2026-06-03T15:21:22.156Z] RavenPy-main/docs/notebooks/06_Raven_calibration.ipynb ......            [ 60%]
[2026-06-03T15:21:30.601Z] RavenPy-main/docs/notebooks/07_Making_and_using_hotstart_files.ipynb ... [ 61%]
[2026-06-03T15:21:32.811Z] ...                                                                      [ 61%]
[2026-06-03T15:21:40.939Z] RavenPy-main/docs/notebooks/08_Getting_and_bias_correcting_CMIP6_data.ipynb . [ 61%]
[2026-06-03T15:22:30.928Z] ............sss                                                          [ 64%]
[2026-06-03T15:22:37.590Z] RavenPy-main/docs/notebooks/09_Hydrological_impacts_of_climate_change.ipynb . [ 64%]
[2026-06-03T15:22:43.428Z] ....                                                                     [ 65%]
[2026-06-03T15:23:26.027Z] RavenPy-main/docs/notebooks/10_Data_assimilation.ipynb ........          [ 66%]
[2026-06-03T15:23:35.701Z] RavenPy-main/docs/notebooks/11_Climatological_ESP_forecasting.ipynb .... [ 67%]
[2026-06-03T15:24:04.187Z] ....                                                                     [ 67%]
[2026-06-03T15:24:14.271Z] RavenPy-main/docs/notebooks/12_Performing_hindcasting_experiments.ipynb . [ 67%]
[2026-06-03T15:24:23.357Z] .......                                                                  [ 69%]
[2026-06-03T15:24:49.804Z] RavenPy-main/docs/notebooks/Assess_probabilistic_flood_risk.ipynb ...... [ 70%]
[2026-06-03T15:24:50.634Z] .                                                                        [ 70%]
[2026-06-03T15:25:00.634Z] RavenPy-main/docs/notebooks/Comparing_hindcasts_and_ESP_forecasts.ipynb . [ 70%]
[2026-06-03T15:25:22.363Z] .......                                                                  [ 71%]
[2026-06-03T15:25:30.488Z] RavenPy-main/docs/notebooks/Distributed_hydrological_modelling.ipynb ... [ 72%]
[2026-06-03T15:25:46.591Z] ....                                                                     [ 72%]
[2026-06-03T15:25:59.809Z] RavenPy-main/docs/notebooks/Hydrological_realtime_forecasting.ipynb .... [ 73%]
[2026-06-03T15:26:05.362Z] ..                                                                       [ 73%]
[2026-06-03T15:26:16.870Z] RavenPy-main/docs/notebooks/Managing_Jupyter_Environments.ipynb ...      [ 74%]
[2026-06-03T15:26:46.923Z] RavenPy-main/docs/notebooks/Perform_Regionalization.ipynb .......        [ 75%]
[2026-06-03T15:26:53.146Z] RavenPy-main/docs/notebooks/Running_HMETS_with_CANOPEX_dataset.ipynb ... [ 75%]
[2026-06-03T15:27:08.798Z] ..........                                                               [ 77%]
[2026-06-03T15:27:31.815Z] RavenPy-main/docs/notebooks/Sensitivity_analysis.ipynb ......            [ 78%]
[2026-06-03T15:27:38.820Z] RavenPy-main/docs/notebooks/time_series_analysis.ipynb ...........       [ 80%]
[2026-06-03T15:27:46.939Z] RavenPy-main/docs/notebooks/paper/Perform_a_climate_change_impact_study_on_a_watershed.ipynb . [ 80%]
[2026-06-03T15:32:04.066Z] .............Fxxxxxx                                                     [ 83%]
[2026-06-03T15:32:18.972Z] xhydro-main/docs/notebooks/pavics_notebooks/climate_change.ipynb ....... [ 84%]
[2026-06-03T15:32:42.679Z] .........................                                                [ 88%]
[2026-06-03T15:32:54.888Z] xhydro-main/docs/notebooks/pavics_notebooks/hydrological_modelling_raven_distributed.ipynb . [ 88%]
[2026-06-03T15:33:07.966Z] ..................FFFFFFFF                                               [ 93%]
[2026-06-03T15:34:05.767Z] xhydro-main/docs/notebooks/pavics_notebooks/pmp.ipynb .................. [ 95%]
[2026-06-03T15:34:39.028Z] ..........                                                               [ 97%]
[2026-06-03T15:34:41.447Z] notebooks/hummingbird.ipynb ..........                                   [ 99%]
[2026-06-03T15:37:30.649Z] notebooks/stress-tests.ipynb .....                                       [100%]
[2026-06-03T15:37:30.649Z] 
[2026-06-03T15:37:30.649Z] =================================== FAILURES ===================================
    
  

Copy link
Copy Markdown
Member

@fmigneault fmigneault left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the broken nginx investigation. All good :shipit:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Improvements or additions to documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants