diff --git a/.drone/drone.jsonnet b/.drone/drone.jsonnet index f3ecb5cd..d6872466 100644 --- a/.drone/drone.jsonnet +++ b/.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: { diff --git a/.drone/scripts/publish-image.sh b/.drone/scripts/publish-image.sh index 74c55d45..d9a659d3 100755 --- a/.drone/scripts/publish-image.sh +++ b/.drone/scripts/publish-image.sh @@ -36,9 +36,9 @@ aurweb_config set notifications smtp-password "${mpr_smtp_password}" aurweb_config set notifications sender "MPR " 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 '{}' + diff --git a/docker-compose.mpr-override.yml b/docker-compose.mpr-override.yml index e584c6eb..c1fa7376 100644 --- a/docker-compose.mpr-override.yml +++ b/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: