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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 2 commits into from
Feb 6, 2024
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
062b1b2
Support non 10943 comms ports in the linux tentacle config script
LukeButters Feb 6, 2024
b8f8033
Support a different address
LukeButters Feb 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 24 additions & 4 deletions linux-packages/content/configure-tentacle.sh
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.


read -p "Where would you like Tentacle to store log files? ($logpath):" inputlogpath
logpath=$(assignNonEmptyValue "$inputlogpath" $logpath)
Expand Down Expand Up @@ -149,6 +150,25 @@ function setupPollingTentacle {
read -p "What name would you like to register this Tentacle with? ($displayname): " displaynameinput
displayname=$(assignNonEmptyValue "$displaynameinput" $displayname)

$doesconnecttosamedomain=1
read -p 'Is the comms port on the same domain as the Octopus Server : 1) Yes or 2) No (default 1): ' doesconnecttosamedomain



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.

commsAddressOrPortArgs="--server-comms-address \"$commsAddress\""
;;

*)
read -p "What port is the Octopus Server comms port? ($servercommsport): " servercommsportinput
servercommsport=$(assignNonEmptyValue "$servercommsportinput" $servercommsport)

commsAddressOrPortArgs="--server-comms-port \"$servercommsport\""
;;
esac

case $machinetype in
2 | worker)
#Get worker pools
Expand Down Expand Up @@ -181,9 +201,9 @@ function setupPollingTentacle {
echo -e "sudo /opt/octopus/tentacle/Tentacle configure --instance \"$instancename\" --app \"$applicationpath\" --noListen \"True\" --reset-trust"

if [ $machinetype = 2 ] || [ $machinetype = "worker" ]; then
echo -e "sudo /opt/octopus/tentacle/Tentacle register-worker --instance \"$instancename\" --server \"$octopusserverurl\" --name \"$displayname\" --comms-style \"TentacleActive\" --server-comms-port \"10943\" $displayauth --space \"$space\" $workerpoolsstring"
echo -e "sudo /opt/octopus/tentacle/Tentacle register-worker --instance \"$instancename\" --server \"$octopusserverurl\" --name \"$displayname\" --comms-style \"TentacleActive\" $commsAddressOrPortArgs $displayauth --space \"$space\" $workerpoolsstring"
else
echo -e "sudo /opt/octopus/tentacle/Tentacle register-with --instance \"$instancename\" --server \"$octopusserverurl\" --name \"$displayname\" --comms-style \"TentacleActive\" --server-comms-port \"10943\" $displayauth --space \"$space\" $envstring $rolesstring"
echo -e "sudo /opt/octopus/tentacle/Tentacle register-with --instance \"$instancename\" --server \"$octopusserverurl\" --name \"$displayname\" --comms-style \"TentacleActive\" $commsAddressOrPortArgs $displayauth --space \"$space\" $envstring $rolesstring"
fi

echo -e "sudo /opt/octopus/tentacle/Tentacle service --install --start --instance \"$instancename\"${NC}"
Expand All @@ -200,9 +220,9 @@ function setupPollingTentacle {
exitIfCommandFailed

if [ $machinetype = 2 ] || [ $machinetype = "worker" ]; then
eval sudo /opt/octopus/tentacle/Tentacle register-worker --instance \"$instancename\" --server \"$octopusserverurl\" --name \"$displayname\" --comms-style \"TentacleActive\" --server-comms-port \"10943\" $auth --space \"$space\" $workerpoolsstring
eval sudo /opt/octopus/tentacle/Tentacle register-worker --instance \"$instancename\" --server \"$octopusserverurl\" --name \"$displayname\" --comms-style \"TentacleActive\" $commsAddressOrPortArgs $auth --space \"$space\" $workerpoolsstring
else
eval sudo /opt/octopus/tentacle/Tentacle register-with --instance \"$instancename\" --server \"$octopusserverurl\" --name \"$displayname\" --comms-style \"TentacleActive\" --server-comms-port \"10943\" $auth --space \"$space\" $envstring $rolesstring
eval sudo /opt/octopus/tentacle/Tentacle register-with --instance \"$instancename\" --server \"$octopusserverurl\" --name \"$displayname\" --comms-style \"TentacleActive\" $commsAddressOrPortArgs $auth --space \"$space\" $envstring $rolesstring
fi

exitIfCommandFailed
Expand Down