fix(create_shell_extension
): import {app,monitor}_hostname
site-specific
variables
#6848
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Status
Ready for review
Description of Changes
Fixes #6847 by importing, rather than reading and then setting new global facts for, the
app_hostname
andmonitor_hostname
site-specific
variables.Testing
/home/amnesia/.ssh/config
and observe templating as shown in [2.6.0-rc1] Application Server's SSH alias is configured incorrectly #6847 (comment).securedrop-admin --force tailsconfig
.~/.ssh/config
again and confirm that both the{app,mon}
aliases and the servers' actual hostnames (if different than the aliases) are presented.ssh $HOSTNAME
works for each aliased hostname.securedrop-admin sdconfig
with junk hostnames and repeating steps (1)‒(3).Deployment
After merge, backport this branch into
release/2.6.0
and add a check for #6847 in the v2.6.0 test plan.