build.sh

@@ -48,8 +48,8 @@ do
 
     # Clone and copy the repository
     rm -rfv "$(basename "$git" .git)"
-    rsa_filename="/etc/lixonet/${netname}/id_rsa"
+    rsa_filename="/etc/lixonet/${netname}/$(basename "$git" .git).key"
-    if [ ! -f $rsa_filename ]; then rsa_filename="/etc/lixonet/id_rsa"; fi
+    if [ ! -f $rsa_filename ]; then rsa_filename="/etc/lixonet/${netname}/id_rsa"; fi
     echo "Using SSH key: $rsa_filename"
     GIT_SSH_COMMAND="ssh -i $rsa_filename -o IdentitiesOnly=yes" git clone $git || { echo "clone $git failed, quitting" ; exit 1; }
     

tinc/tinc.conf.tmpl

@@ -22,7 +22,7 @@ AddressFamily = ${tinc_address_family:-any}
 # Default over-the-wire security for Lixonet.
 # Blowfish: https://en.wikipedia.org/wiki/Blowfish_(cipher)
 # SHA1: https://en.wikipedia.org/wiki/SHA-1
-Cipher = ${tinc_cipher:-aes-256-cbc}
+Cipher = ${tinc_cipher:-blowfish}
 Digest = ${tinc_digest:-sha1}
 
 # When this option is enabled, packets that cannot be sent directly to the

version

@@ -1 +1 @@
-63
+54