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

Fixes #37877 - Make the config file compatible with 0.2.z and 0.4.z #10340

Merged
merged 1 commit into from
Oct 31, 2024
Merged

Fixes #37877 - Make the config file compatible with 0.2.z and 0.4.z #10340

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 18 additions & 9 deletions app/views/unattended/provisioning_templates/registration/remote_execution_pull_setup.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,34 +54,43 @@ if [ -f $CONFIGTOML ]; then
cat <<EOF > $CONFIGTOML
# yggdrasil global configuration settings written by katello-pull-transport-migrate
broker = ["mqtts://$SERVER_NAME:1883"]
server = ["mqtts://$SERVER_NAME:1883"]
cert-file = "$CERT_FILE"
key-file = "$KEY_FILE"
ca-root = ["$CA_FILE"]
log-level = "error"
data-host = ""
path-prefix = "yggdrasil"
EOF

else
echo "$SYSCONFDIR/yggdrasil/config.toml not found! Did 'yum install yggdrasil' succeed?"
exit 1
fi

YGGDRASIL_SERVICE=yggdrasil.service
systemctl cat $YGGDRASIL_SERVICE >/dev/null 2>/dev/null || YGGDRASIL_SERVICE=yggdrasild.service

# start the yggdrasild service
if systemctl is-enabled yggdrasild 2>/dev/null && [ -n "$YGGDRASIL_RESTART_DELAY" ] && [ "$YGGDRASIL_RESTART_DELAY" -gt 0 ]; then
systemd-run --on-active="$YGGDRASIL_RESTART_DELAY" --collect --no-block systemctl restart yggdrasild
if systemctl is-enabled $YGGDRASIL_SERVICE 2>/dev/null && [ -n "$YGGDRASIL_RESTART_DELAY" ] && [ "$YGGDRASIL_RESTART_DELAY" -gt 0 ]; then
systemd-run --on-active="$YGGDRASIL_RESTART_DELAY" --collect --no-block systemctl restart $YGGDRASIL_SERVICE
else
echo "Starting yggdrasild..."
systemctl try-restart yggdrasild
systemctl enable --now yggdrasild
echo "Starting $YGGDRASIL_SERVICE..."
systemctl try-restart $YGGDRASIL_SERVICE
systemctl enable --now $YGGDRASIL_SERVICE

# check status of yggdrasild and fail if it is not running
# check status of $YGGDRASIL_SERVICE and fail if it is not running
# possible failure reason: incorrect protocol (should be tcp:// or mqtt://) or port (should be 1883)
# also, cert-file and key-file must be valid
# and broker must be running on the server
yggdrasil status
# yggdrasil-0.2.z provides a dedicated status subcommand, newer yggdrasil doesn't have anything like that
if which yggdrasil >/dev/null 2>/dev/null; then
yggdrasil status
fi

if ! systemctl is-active --quiet yggdrasild; then
if ! systemctl is-active --quiet $YGGDRASIL_SERVICE; then
echo ""
echo "yggdrasild failed to start! Check configuration in $CONFIGTOML and make sure the broker is running on the server."
echo "$YGGDRASIL_SERVICE failed to start! Check configuration in $CONFIGTOML and make sure the broker is running on the server."
exit $?
fi
fi
Expand Down
Loading