Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add packaging support for unix domain sockets #442

Merged
merged 3 commits into from
Nov 28, 2023

Conversation

minfrin
Copy link
Contributor

@minfrin minfrin commented Nov 6, 2023

  • Add /run/jenkins path in systemd-tmpfiles as a home for the socket
  • Support JENKINS_UNIX_DOMAIN_PATH variable to pass the socket path

Added to winstone: jenkinsci/winstone#346 / jenkinsci/winstone#345

Testing done

  • jenkins.war from most recent master

  • RPM created as follows:

WAR=/home/minfrin/jenkins.war MSI= BUILDENV=env/release.mk BRAND=branding/jenkins.mk make rpm
  • /etc/sysconfig/jenkins modified for testing as follows:
JAVA_HOME=/etc/alternatives/jre_17

JENKINS_PORT=-1
JENKINS_PREFIX=/jenkins
JENKINS_UNIX_DOMAIN_PATH=/var/run/jenkins/jenkins.socket

Apache httpd configured as follows:

  ProxyPass unix:///run/jenkins/jenkins.socket|http://localhost/jenkins nocanon
  ProxyPassReverse unix:///run/jenkins/jenkins.socket|http://localhost/jenkins

Submitter checklist

- Add /run/jenkins path in systemd-tmpfiles as a home for the socket
- Support JENKINS_UNIX_DOMAIN_PATH variable to pass the socket path
@minfrin minfrin requested a review from a team as a code owner November 6, 2023 23:09
Copy link
Member

@timja timja left a comment

Choose a reason for hiding this comment

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

Thanks!

@timja
Copy link
Member

timja commented Nov 28, 2023

cc @kmartens27 / @MarkEWaite for changelog

@@ -0,0 +1 @@
D /run/jenkins 0770 jenkins jenkins -

Choose a reason for hiding this comment

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

RuntimeDirectory="jenkins"

in jenkins.service should be a better fit here than a tmpfile.

Copy link
Contributor

Choose a reason for hiding this comment

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

in jenkins.service should be a better fit here than a tmpfile.

It is usually much more effective to submit a pull request with an explanation why a different location would be better. If you're not ready to submit a pull request, then an issue report is another way to start the conversation.

Commenting on a merged pull request is not nearly as likely to result in any action.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants