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

The linux configure-tentacle.sh script now supports setting comms ports other than 10943. #792

Merged

Conversation

LukeButters
Copy link
Contributor

@LukeButters LukeButters commented Feb 6, 2024

Background

[SC-68270]

Fixes: #793

Related to: #527

Results

Before

The script would always assume 10943 as the comms port.

After

It now asks if the comms port is at the same or different address:

Is the comms port on the same domain as the Octopus Server : 1) Yes or 2) No (default 1): 2
What is the Octopus Server comms address including port e.g. 'https://polling.<yoururl>.octopus.app:443' ?: https://127.0.0.1:11943

which results in:

sudo /opt/octopus/tentacle/Tentacle register-with --instance "Tentacle" --server "http://127.0.0.1:8066" --name "aero2" --comms-style "TentacleActive" --server-comms-address "https://127.0.0.1:11943" --apiKey "API-XXXXXXXXXXXXXXXXXXXXXXXXXX" --space "Default" --environment "bready"  --role "roll" 

If the address is the same we also ask what port:

Is the comms port on the same domain as the Octopus Server : 1) Yes or 2) No (default 1): 
What port is the Octopus Server comms port? (10943): 11943

and the resulting command:

sudo /opt/octopus/tentacle/Tentacle register-with --instance "aa-luke-2" --server "http://127.0.0.1:8066" --name "aero4" --comms-style "TentacleActive" --server-comms-port "11943" --apiKey "API-XXXXXXXXXXXXXXXXXXXXXXXXXX" --space "Default" --environment "Dev"  --role "bread" 

How to review this PR

Quality ✔️

Pre-requisites

  • I have read How we use GitHub Issues for help deciding when and where it's appropriate to make an issue.
  • I have considered informing or consulting the right people, according to the ownership map.
  • I have considered appropriate testing for my change.

@LukeButters LukeButters requested a review from a team as a code owner February 6, 2024 00:04
@LukeButters LukeButters enabled auto-merge (squash) February 6, 2024 00:05
@LukeButters LukeButters force-pushed the sast/support-comms-alternate-ports-in-linux-config-script branch from 19db3b0 to 062b1b2 Compare February 6, 2024 00:18
@@ -100,6 +100,7 @@ function setupPollingTentacle {
rolesstring=""
workerpoolsstring=""
machinetype=1
servercommsport=10943
Copy link
Contributor

Choose a reason for hiding this comment

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

Out of curiosity, do we know why this was strictly only set to 10943 before?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Probably because it is the default.


case $doesconnecttosamedomain in
2)
read -p "What is the Octopus Server comms address including port e.g. 'https://polling.<yoururl>.octopus.app:443' ?: " commsAddress
Copy link
Contributor

Choose a reason for hiding this comment

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

The public doco doesn't mention that the port number needs to be specified. Would it work if we do?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I requested it since it makes the bash easier, otherwise we then need to ask for port if a port is not set.

Also yes this does work.

@LukeButters LukeButters enabled auto-merge (squash) February 6, 2024 03:34
Copy link
Contributor

@raynhamdev raynhamdev left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@LukeButters LukeButters enabled auto-merge (squash) February 6, 2024 03:38
@LukeButters LukeButters merged commit 2ee6d71 into main Feb 6, 2024
48 of 49 checks passed
@LukeButters LukeButters deleted the sast/support-comms-alternate-ports-in-linux-config-script branch February 6, 2024 03:55
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.

Add Support for Polling 443 on a different address in the Linux configure-tentacle.sh script
2 participants