Adapt ssh key directory and hetzner server deletion logic

Author: jpaquim

hetzner/create.sh

@@ -7,17 +7,19 @@ script=$(readlink -f "$0")
 dir=$(dirname "$script")
 
 project=$PROJECT
-key_file=id_root-$project
-key_name=root@$project
-key_path=$dir/id/$key_file
+key_dir=~/.ssh/id
+key_file="root-$project"
+key_name="root@$project"
+key_path="$key_dir/$key_file"
 server=$project
 
 # hcloud context create $project
 hcloud context use $project
 
+mkdir -pm 700 $key_dir
 ssh-keygen -t ed25519 -a 100 -C $key_name -f $key_path
 ssh-add $key_path
-hcloud ssh-key create --name $key_name --public-key-from-file $key_path.pub
+hcloud ssh-key create --name $key_name --public-key-from-file "$key_path.pub"
 
 firewalls/create.sh
 
@@ -30,4 +32,15 @@ hcloud server create \
   --name $server \
   --ssh-key $key_name \
   --type cax11 \
-  -o json >$server.json
+  -o json >$dir/$server.json
+
+ipv4=$(hcloud server ip $server)
+ipv6=$(hcloud server ip -6 $server)
+
+cat <<EOF >>~/.ssh/config
+
+Host $server
+  HostName $ipv4
+  User root
+  IdentityFile $key_path
+EOF

hetzner/delete.sh

@@ -7,17 +7,18 @@ script=$(readlink -f "$0")
 dir=$(dirname "$script")
 
 project=$PROJECT
-key_file=id_root-$project
-key_name=root@$project
-key_path=$dir/id/$key_file
+key_dir="~/.ssh/id"
+key_file="root-$project"
+key_name="root@$project"
+key_path="$key_dir/$key_file"
 server=$project
 
 hcloud context use $project
 
-firewalls/delete.sh
-
 hcloud server disable-protection $server delete rebuild
 hcloud server delete $server
 
+firewalls/delete.sh
+
 hcloud ssh-key delete $key_name
-# rm $key_path
+echo "local key path: $key_path"