Skip to content

Conversation

@ndg63276
Copy link
Collaborator

@ndg63276 ndg63276 commented Jan 22, 2025

JIRA ticket: LIMS-1621

Summary:

If the webcams require a username and password to view, this can be added to the address in the config file, but that will be ignored without telling curl to use it.

Changes:

  • Allow curl to use any suitable auth method

To test:

  • Get the i19 webcam username and password from Mark or Sarah Barnett
  • Update the $webcams array in the config, to set (with real credentials)
'i03' => array('172.23.103.177', '172.23.103.176'),
'i19-1' => array('user:pass@i19-webcam10.diamond.ac.uk', 'user:pass@i19-webcam11.diamond.ac.uk'),
'i19-2' => array('user:pass@i19-webcam8.diamond.ac.uk', 'user:pass@i19-webcam9.diamond.ac.uk'),
  • Log in to proposal cm40638, then go to /status/bl/i19-1, check the webcams work
  • Do the same for cm40607 and /status/bl/i03, check the webcams still work

@ndg63276 ndg63276 changed the base branch from master to pre-release/2025-R1.3 February 11, 2025 09:34
@ndg63276 ndg63276 merged commit f85c5d9 into pre-release/2025-R1.3 Feb 11, 2025
2 checks passed
@ndg63276 ndg63276 deleted the improvement/LIMS-1621/support-webcam-auth branch March 4, 2025 10:18
ndg63276 added a commit that referenced this pull request Mar 11, 2025
* LIMS-1621: Support webcam auth (#898)

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-1549: Disallow dispatch requests on dewars that are 'processing' (#884)

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-1287: Improve workflow for responsive scheduling (#889)

* LIMS-1287: Improve workflow for responsive scheduling

* LIMS-1287: Dont allow 'Other' for red/yellow shipments

---------

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-1064: Display dropdown or span depending on number of schema options (#870)

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-1589 - Remove Highcharts (#878)

* Remove touchscreen app

* Remove unused dependencies

* Remove local version of jquery-flot-pie

* Remove aliased dependencies

* Remove unused app file, dead dependencies

* Remove unused vendor files

* Remove unused dependencies

* Remove Highcharts and Moment dependencies

* Reinstate call to plotYears

Co-authored-by: Mark W <24956497+ndg63276@users.noreply.github.com>

---------

Co-authored-by: Mark W <24956497+ndg63276@users.noreply.github.com>

* LIMS-103: Fix various bugs in Screens UI (#863)

* LIMS-103: Fix various bugs in Screens UI

* Update api/src/Page/Shipment.php

Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>

---------

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>

* LIMS-1652: Revert underscore to 1.8.3 (#906)

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-1287: Improve help text

---------

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants