encrypt-email: Update wording on help text
Dionysis Grigoropoulos committed
Mar 29, 2025 at 00:30 UTC
b0cb6ebf796871ce0b4a0eae2997ddff15f57a28
1 file changed
+7
-16
non-critical-infra/packages/encrypt-email/encrypt-email.py
+7
-16
@@ -94,15 +94,9 @@ def address(address_id: str, email: str, force: bool) -> None:
94
click.secho("Removed whitespace surrounding given email address", fg="yellow")
95
email = clean_email
96
97
- project_root = find_relative_project_root()
98
- non_critical_infra_dir = project_root / "non-critical-infra"
99
-
97
secret_path = non_critical_infra_dir / f"secrets/{address_id}-email-address.umbriel"
98
encrypt_to_file(email, secret_path, force)
99
103
- mailing_lists_nix = non_critical_infra_dir / "modules/mailserver/mailing-lists.nix"
104
- assert mailing_lists_nix.exists()
105
-
100
click.secho()
101
click.secho("Now add `", nl=False)
102
click.secho(
@@ -136,34 +130,31 @@ def login(address_id: str, force: bool) -> None:
130
131
hashed_password = hash_password(password)
132
139
- project_root = find_relative_project_root()
140
- non_critical_infra_dir = project_root / "non-critical-infra"
141
-
133
secret_path = non_critical_infra_dir / f"secrets/{address_id}-email-login.umbriel"
134
encrypt_to_file(hashed_password, secret_path, force)
135
145
- default_nix = non_critical_infra_dir / "modules/mailserver/default.nix"
146
- assert default_nix.exists()
147
-
136
nix_code = dedent(
137
f"""\
138
"{address_id}@nixos.org" = {{
139
forwardTo = [
140
# Add emails here
141
];
154
- loginAccount.encryptedHashedPassword = ../../secrets/test-sender-email-login.umbriel;
142
+ loginAccount.encryptedHashedPassword = ../../secrets/{address_id}-email-login.umbriel;
143
}};
144
"""
145
)
146
click.secho()
147
click.secho("Now add this login account to ", nl=False)
160
- click.secho(default_nix, fg="blue", nl=False)
161
- click.secho(". Search for '", nl=False)
162
- click.secho("### Mailing lists go here ###", fg="blue", nl=False)
148
+ click.secho(mailing_lists_nix, fg="blue", nl=False)
149
click.secho("'. Add or edit an entry that looks like this:")
150
click.secho()
151
click.secho(indent(nix_code, prefix=" " * 4), fg="blue")
152
153
154
if __name__ == "__main__":
155
+ project_root = find_relative_project_root()
156
+ non_critical_infra_dir = project_root / "non-critical-infra"
157
+ mailing_lists_nix = non_critical_infra_dir / "modules/mailserver/mailing-lists.nix"
158
+ assert mailing_lists_nix.exists()
159
+
160
main()