[Pkg-ganeti-devel] [ganeti] 07/12: Set default values for ssh_key_type and ssh_key_bits

[Apollon Oikonomopoulos]

This is an automated email from the git hooks/post-receive script.

apoikos pushed a commit to branch master
in repository ganeti.

commit 49290103760bdfabeaa17b52c4eb455ad12b64d9
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Wed May 24 17:17:01 2017 +0300

    Set default values for ssh_key_type and ssh_key_bits
    
    As we are introducing new functionality between tiny versions and
    cfgupgrade will not be run, we need to instruct WConfd to handle
    non-existing ssh_key_type and ssh_key_bits in the config. We do so by
    changing the respective fields to defaultField and defaulting to the
    previous hardcoded 1024 bit DSA key parameters.
---
 debian/patches/series                              |  1 +
 .../patches/set-defaults-for-ssh-type-bits.patch   | 31 ++++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index 9e0e585..7494ea1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ ghc8-fixes
 snap-server-1.0-compat
 non-DSA-SSH-key-support.patch
 fix-ssh-key-renewal-on-single-node-clusters.patch
+set-defaults-for-ssh-type-bits.patch
diff --git a/debian/patches/set-defaults-for-ssh-type-bits.patch b/debian/patches/set-defaults-for-ssh-type-bits.patch
new file mode 100644
index 0000000..5f88aa7
--- /dev/null
+++ b/debian/patches/set-defaults-for-ssh-type-bits.patch
@@ -0,0 +1,31 @@
+From 423832d2f3ba90deae1e58c52aad6aac5b3a1e9d Mon Sep 17 00:00:00 2001
+From: Apollon Oikonomopoulos <apoikos at debian.org>
+Date: Wed, 24 May 2017 16:36:30 +0300
+Subject: [PATCH 2/2] Use runtime defaults for ssh_key_type and ssh_key_bits
+
+Since we are introducing config changes in a minor version, we need to
+assume sane defaults.
+---
+ src/Ganeti/Objects.hs | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/Ganeti/Objects.hs b/src/Ganeti/Objects.hs
+index 281885171..76a7e7128 100644
+--- a/src/Ganeti/Objects.hs
++++ b/src/Ganeti/Objects.hs
+@@ -678,8 +678,10 @@ $(buildObject "Cluster" "cluster" $
+   , simpleField "compression_tools"              [t| [String]                |]
+   , simpleField "enabled_user_shutdown"          [t| Bool                    |]
+   , simpleField "data_collectors"         [t| Container DataCollectorConfig  |]
+-  , simpleField "ssh_key_type"                   [t| SshKeyType              |]
+-  , simpleField "ssh_key_bits"                   [t| Int                     |]
++  , defaultField [| DSA |] $
++    simpleField "ssh_key_type"                   [t| SshKeyType             |]
++  , defaultField [| 1024 |] $
++    simpleField "ssh_key_bits"                   [t| Int                    |]
+  ]
+  ++ timeStampFields
+  ++ uuidFields
+-- 
+2.11.0
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git