Fix SSH key locations for new server layout

As of a week or so ago the MPR server has been put on the main homelab instance, and that has brought about some layout changes for where things like the SSH keys are stored.

Author: hwittenborn

.drone/drone.jsonnet

@@ -24,7 +24,7 @@ local publishImage() = {
     type: "exec",
     trigger: {branch: ["main"]},
     depends_on: ["run-tests"],
-    node: {server: "mprweb"},
+    node: {server: "homelab"},
     steps: [{
         name: "publish-image",
         environment: {

.drone/scripts/publish-image.sh

@@ -36,9 +36,9 @@ aurweb_config set notifications smtp-password "${mpr_smtp_password}"
 aurweb_config set notifications sender "MPR <mpr@${makedeb_url}>"
 aurweb_config set notifications reply-to "mpr@${makedeb_url}"
 
-ed25519_key="$(ssh-keygen -lf /etc/ssh/ssh_host_ed25519_key.pub  | awk '{print $2}')"
-ecdsa_key="$(ssh-keygen -lf /etc/ssh/ssh_host_ecdsa_key.pub  | awk '{print $2}')"
-rsa_key="$(ssh-keygen -lf /etc/ssh/ssh_host_rsa_key.pub  | awk '{print $2}')"
+ed25519_key="$(ssh-keygen -lf /var/www/mpr.makedeb.org/keys/ssh_host_ed25519_key.pub  | awk '{print $2}')"
+ecdsa_key="$(ssh-keygen -lf /var/www/mpr.makedeb.org/keys/ssh_host_ecdsa_key.pub  | awk '{print $2}')"
+rsa_key="$(ssh-keygen -lf /var/www/mpr.makedeb.org/keys/ssh_host_rsa_key.pub  | awk '{print $2}')"
 
 aurweb_config set fingerprints Ed25519 "${ed25519_key}"
 aurweb_config set fingerprints ECDSA "${ecdsa_key}"
@@ -60,6 +60,7 @@ docker-compose -f ./docker-compose.yml \
 find ./ -maxdepth 1 \
         -not -path './' \
         -not -path './data' \
+	-not -path './keys' \
         -not -path './service.sh' \
         -exec rm -rf '{}' +
 

docker-compose.mpr-override.yml

@@ -11,9 +11,9 @@ services:
     volumes:
       - ./data/git_data:/aurweb/aur.git
       - ./data:/aurweb/data
-      - /etc/ssh/ssh_host_ecdsa_key:/etc/ssh/ssh_host_ecdsa_key:ro
-      - /etc/ssh/ssh_host_ed25519_key:/etc/ssh/ssh_host_ed25519_key:ro
-      - /etc/ssh/ssh_host_rsa_key:/etc/ssh/ssh_host_rsa_key:ro
+      - ./keys/ssh_host_ecdsa_key:/etc/ssh/ssh_host_ecdsa_key:ro
+      - ./keys/ssh_host_ed25519_key:/etc/ssh/ssh_host_ed25519_key:ro
+      - ./keys/ssh_host_rsa_key:/etc/ssh/ssh_host_rsa_key:ro
 
   smartgit:
     volumes: