Merge "Correct documented path of wmf-update-ssh-config"
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..5271e28
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,16 @@
+# Cannonical commit name mappings
+#
+# Mappings use one of two forms. The first maps an email address to the
+# cannonical proper name:
+# Proper Name <commit@email.xx>
+#
+# The second maps any Proper Name <email> value to a cannonical Proper Name
+# <email> value based on the email used by the commit:
+# Proper Name <proper@email.xx> <commit@email.xx>
+#
+# Some users have multiple mappings to deal with a variety of emails and/or
+# proper names associated with their commit history.
+#
+# See https://www.kernel.org/pub/software/scm/git/docs/git-shortlog.html
+Stevie Beth Mhaol <sbmhaol@wikimedia.org>
+Stevie Beth Mhaol <sbmhaol@wikimedia.org> <sshirley@wikimedia.org>
diff --git a/debian/control b/debian/control
index aff361a..6cec757 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@
Provides: wmf-sre-laptop
Replaces: wmf-sre-laptop
Conflicts: wmf-sre-laptop, pwstore
-Depends: ruby, gnupg2, git, colordiff
+Depends: ruby, gnupg2, git, colordiff, curl
Recommends: git-review (>= 1.27.0-1)
Description: Basic configs/scripts for laptops of WMF SREs
This package ships a number of common scripts and configs to setup a
diff --git a/scripts/wmf-update-ssh-config b/scripts/wmf-update-ssh-config
index bbfecb2..4cedddd 100755
--- a/scripts/wmf-update-ssh-config
+++ b/scripts/wmf-update-ssh-config
@@ -70,6 +70,9 @@
parser = argparse.ArgumentParser()
parser.add_argument("configfile", metavar="OUTPUT_FILE", nargs="?", default="",
help="File to write SSH config to (defaults to ~/.ssh/config)")
+ parser.add_argument("-s", "--skip-systemd",
+ help="Skip systemd service activation",
+ action="store_true")
args = parser.parse_args()
ssh_dir = Path.home().joinpath(".ssh")
keys = {}
@@ -85,8 +88,9 @@
update_ssh_config(configfile, keys)
make_known_hosts_dir(ssh_dir)
# Now let's ensure the services are up and running.
- for env in ENVS:
- start_systemd(env)
+ if args.skip_systemd == False:
+ for env in ENVS:
+ start_systemd(env)
if __name__ == "__main__":