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

fix(create_shell_extension): import {app,monitor}_hostname site-specific variables #6848

Merged
merged 1 commit into from
Jun 15, 2023

Conversation

cfm
Copy link
Member

@cfm cfm commented Jun 14, 2023

Status

Ready for review

Description of Changes

Fixes #6847 by importing, rather than reading and then setting new global facts for, the app_hostname and monitor_hostname site-specific variables.

Testing

  1. If you were involved in testing Add a GNOME Shell Extension #6712, check that Admin Workstation's /home/amnesia/.ssh/config and observe templating as shown in [2.6.0-rc1] Application Server's SSH alias is configured incorrectly #6847 (comment).
  2. From this branch, securedrop-admin --force tailsconfig.
  3. Check ~/.ssh/config again and confirm that both the {app,mon} aliases and the servers' actual hostnames (if different than the aliases) are presented.
  4. ssh $HOSTNAME works for each aliased hostname.
  5. If the hostnames aren't different, bonus points for running 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.

…fic variables

---rather than overriding them globally as facts.
@cfm cfm added this to the SecureDrop 2.6.0 milestone Jun 14, 2023
@cfm cfm requested a review from a team as a code owner June 14, 2023 23:57
@cfm cfm requested a review from zenmonkeykstop June 14, 2023 23:58
Copy link
Contributor

@zenmonkeykstop zenmonkeykstop left a comment

Choose a reason for hiding this comment

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

Checklist checks out including bonus points

@zenmonkeykstop zenmonkeykstop merged commit e599175 into develop Jun 15, 2023
@zenmonkeykstop zenmonkeykstop deleted the 6847-hostname-facts branch June 15, 2023 15:30
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.

[2.6.0-rc1] Application Server's SSH alias is configured incorrectly
2 participants