cleanups, bump version to 1.0-30

diff --git a/Makefile b/Makefile
index 2d5cd810824a2d13523f27a7c3f617b3c48feb3f..9c785f503d92eda4d5fbe480d1609da3d68ff42d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ RELEASE=2.2
 
 PACKAGE=pve-cluster
 PKGVER=1.0
-PKGREL=29
+PKGREL=30
 
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 

diff --git a/data/PVE/Cluster.pm b/data/PVE/Cluster.pm
index 9f251ba8b3bb9b9b08971dab4af465e0a814a1b0..3387fc82fe55800b9c08e4ed69ce2ccc95e436a4 100644 (file)
--- a/data/PVE/Cluster.pm
+++ b/data/PVE/Cluster.pm
@@ -1035,10 +1035,10 @@ sub setup_rootsshconfig {
 
     # create ssh config if it does not exist
     if (! -f $rootsshconfig) {
-        mkdir '/root/.ssh' if ( !-e '/root/.ssh' );
-        if (my $fh = IO::File->new ($rootsshconfig, O_CREAT|O_WRONLY|O_EXCL, 0640)) {
+        mkdir '/root/.ssh';
+        if (my $fh = IO::File->new($rootsshconfig, O_CREAT|O_WRONLY|O_EXCL, 0640)) {
             # this is the default ciphers list from debian openssl0.9.8 except blowfish is added as prefered
-            print $fh "Ciphers blowfish,aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc\n";
+            print $fh "Ciphers blowfish-cbc,aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc\n";
             close($fh);
         }
     }

diff --git a/debian/changelog b/debian/changelog
index 5b043e86bcb64c019632ab6bdfc36bda27ba97cc..19b85a3f960917256b2d222a89bfbdb28ba8fc35 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pve-cluster (1.0-30) unstable; urgency=low
+
+  * create /root/.ssh/config and set default Chiphers
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 31 Oct 2012 13:47:17 +0100
+
 pve-cluster (1.0-29) unstable; urgency=low
 
   * fix caching problems in create_rrd_graph (do not save any data to files)