{manifests,overlay}: add ssh-key-dir

Drop sshd_config.d fragment overriding AuthorizedKeysFile, since ssh-key-dir will pull in the Ignition and Afterburn fragments now.
dustymabe · Jun 26, 2020 · 90692fc · 90692fc
1 parent ea084a3
commit 90692fc
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 11 deletions.
diff --git a/manifest-lock.overrides.aarch64.yaml b/manifest-lock.overrides.aarch64.yaml
@@ -1,2 +1,5 @@
-# no overrides at this time
-packages: {}
+packages:
+  # Fast-track initial build of ssh-key-dir
+  # https://bodhi.fedoraproject.org/updates/FEDORA-2020-2d340985eb
+  ssh-key-dir:
+    evra: 0.1.2-2.fc32.aarch64
diff --git a/manifest-lock.overrides.ppc64le.yaml b/manifest-lock.overrides.ppc64le.yaml
@@ -1,2 +1,5 @@
-# no overrides at this time
-packages: {}
+packages:
+  # Fast-track initial build of ssh-key-dir
+  # https://bodhi.fedoraproject.org/updates/FEDORA-2020-2d340985eb
+  ssh-key-dir:
+    evra: 0.1.2-2.fc32.ppc64le
diff --git a/manifest-lock.overrides.s390x.yaml b/manifest-lock.overrides.s390x.yaml
@@ -1,2 +1,5 @@
-# no overrides at this time
-packages: {}
+packages:
+  # Fast-track initial build of ssh-key-dir
+  # https://bodhi.fedoraproject.org/updates/FEDORA-2020-2d340985eb
+  ssh-key-dir:
+    evra: 0.1.2-2.fc32.s390x
diff --git a/manifest-lock.overrides.x86_64.yaml b/manifest-lock.overrides.x86_64.yaml
@@ -1,2 +1,5 @@
-# no overrides at this time
-packages: {}
+packages:
+  # Fast-track initial build of ssh-key-dir
+  # https://bodhi.fedoraproject.org/updates/FEDORA-2020-2d340985eb
+  ssh-key-dir:
+    evra: 0.1.2-2.fc32.x86_64
diff --git a/manifests/fedora-coreos-base.yaml b/manifests/fedora-coreos-base.yaml
@@ -94,6 +94,7 @@ packages:
   - passwd
   # SSH
   - openssh-server openssh-clients
+  - ssh-key-dir
   # Containers
   - podman skopeo runc systemd-container catatonit
   - fuse-overlayfs slirp4netns

diff --git a/overlay.d/15fcos/etc/ssh/sshd_config.d/20-authorized-keys.conf b/overlay.d/15fcos/etc/ssh/sshd_config.d/20-authorized-keys.conf