Skip to content

Followup to !30199 (ce) to fix #60120 (ce)

Daniel Le Berre requested to merge (removed):patch-29 into master

What does this MR do?

This MR completes the instructions to integrate a plantuml local server with gitlab.

The original MR was following the mapping I used on my own instance of gitlab: https://gitlab.example.com/plantuml to https://localhost:8080/plantuml.

I was asked to use another mapping to prevent issues with top level names, i.e. https://gitlab.example.com/-/plantuml to https://localhost:8080/plantuml.

I just changed the mapping on the doc, without trying it on my own instance.

I tried it yesterday and noticed that the proposed mapping does not work.

  • The proxy configuration correctly maps https://gitlab.example.com/-/plantuml/ to https://localhost:8080/plantuml/.
  • However, the resulting response is https://gitlab.example.com/plantuml/uml/xxxxxxx which is not correct, the expected response should be https://gitlab.example.com/-/plantuml/uml/xxxxxxx, thus the UML diagrams do not show up.

The current nginx configuration is thus not correct. I tried several alternative configurations without being able to fix the problem. I need some help from an nginx guru from gitlab to fix this.

I also noted that I missed a call to gitlab-ctl reconfigure to enable the changes in the file gitlab.rb. This is corrected in that MR.

Screenshots

Does this MR meet the acceptance criteria?

Conformity

Performance and Testing

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • Label as security and @ mention @gitlab-com/gl-security/appsec
  • The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • Security reports checked/validated by a reviewer from the AppSec team
Edited by 🤖 GitLab Bot 🤖

Merge request reports