From 16168bc791e639cfc49933759fb1ea8a7f6e20ef Mon Sep 17 00:00:00 2001 From: Pierre Neyron Date: Fri, 10 Mar 2017 18:05:47 +0100 Subject: [PATCH 1/2] [Debirf] Jessie: fix libntfs --- .../debirf-jessie/kadeploy-deploy-kernel/debirf.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/deploy_env_generation/debirf-jessie/kadeploy-deploy-kernel/debirf.conf b/addons/deploy_env_generation/debirf-jessie/kadeploy-deploy-kernel/debirf.conf index 1f08fb5e..eea051e0 100644 --- a/addons/deploy_env_generation/debirf-jessie/kadeploy-deploy-kernel/debirf.conf +++ b/addons/deploy_env_generation/debirf-jessie/kadeploy-deploy-kernel/debirf.conf @@ -44,6 +44,6 @@ DEBIRF_MIRROR="http://ftp.fr.debian.org/debian" # #export http_proxy= -export INCLUDE=$INCLUDE,taktuk,openssh-client,openssh-server,kexec-tools,tar,bzip2,xz-utils,grub-pc,hdparm,parted,ntpdate,ctorrent,ash,isc-dhcp-client,dosfstools,fsarchiver,ruby,systemd,systemd-sysv,ruby-net-ssh,ruby-net-ssh-multi,ruby-daemons,libntfs10,aufs-tools +export INCLUDE=$INCLUDE,taktuk,openssh-client,openssh-server,kexec-tools,tar,bzip2,xz-utils,grub-pc,hdparm,parted,ntpdate,ctorrent,ash,isc-dhcp-client,dosfstools,fsarchiver,ruby,systemd,systemd-sysv,ruby-net-ssh,ruby-net-ssh-multi,ruby-daemons,ntfs-3g,aufs-tools export EXCLUDE=$EXCLUDE,vim-common,vim-tiny,laptop-detect,wget,network-manager,dhcpcd,sysvinit From 5642a9742af2aa092a9a721e9e343d42852397b8 Mon Sep 17 00:00:00 2001 From: Pierre Neyron Date: Sun, 2 Apr 2017 23:22:48 +0200 Subject: [PATCH 2/2] [addons] drop ssh keys but add script to generate them --- addons/README | 3 +++ addons/generate-deploy-ssh-keys | 6 ++++++ addons/ssh/.gitignore | 2 ++ addons/ssh/id_deploy | 27 --------------------------- addons/ssh/id_deploy.pub | 1 - 5 files changed, 11 insertions(+), 28 deletions(-) create mode 100644 addons/README create mode 100755 addons/generate-deploy-ssh-keys create mode 100644 addons/ssh/.gitignore delete mode 100644 addons/ssh/id_deploy delete mode 100644 addons/ssh/id_deploy.pub diff --git a/addons/README b/addons/README new file mode 100644 index 00000000..54c981d1 --- /dev/null +++ b/addons/README @@ -0,0 +1,3 @@ +# First generate the deploy ssh key pair before building the addons + +kadeploy/addons$ ./generate-deploy-ssh-keys diff --git a/addons/generate-deploy-ssh-keys b/addons/generate-deploy-ssh-keys new file mode 100755 index 00000000..4db54f32 --- /dev/null +++ b/addons/generate-deploy-ssh-keys @@ -0,0 +1,6 @@ +#!/bin/bash -e +# Generate the ssh keys to be used by addons + +mkdir -p ssh +cd ssh +ssh-keygen -f id_deploy -N "" diff --git a/addons/ssh/.gitignore b/addons/ssh/.gitignore new file mode 100644 index 00000000..cfb716bc --- /dev/null +++ b/addons/ssh/.gitignore @@ -0,0 +1,2 @@ +id_deploy +id_deploy.pub diff --git a/addons/ssh/id_deploy b/addons/ssh/id_deploy deleted file mode 100644 index 525741bb..00000000 --- a/addons/ssh/id_deploy +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEoQIBAAKCAQEAs042FrD2J189SdM1FiikSIQh5XCE/zFQjJw4oBPJ8ywrPN2j -2C5wV5esXUJyO6/iMyJlf/2ht6DvzFKeOnXEgUvSuLeLVso5bnsgrWS+0hIRlyll -d7s+ovfCL7VYMRV5KvO1Is0z3MamHLHVZ6SpMf04cJ987YCA2tiYxqrQHCYTnbhS -PocGYj5SODSncTMaTp8CVIH9HlEr+Iw6PLXZQIxQlA0a9zT3l5bU2R2ugREQHBar -cZmHVU75KEZrnLc2d8wSnZUke1wBBf1aXy7da/njSSROTv+bwTe2qPMJUYdqrVOf -mHKLX23x2iP6qMejySpdKMjoOYGeS4f6w9mzVQIBIwKCAQB6881RY2b2bTFXMb4A -kOWuEXZUL+YrVQQIpaMr8E/3NDrn6HBZuXGbJi0Mv9lNf+uQxyEHTtVKt3/ckGx/ -27nyQp8fk81C08+cNyxZpCsTtJ5ZBnF2rEg1PC1iivqlUI2Zy69oUjIw/T60lzM/ -wV4TplKWXrwQkqGAH360HVuBAwStvnVde3KUXC8FePaTQnBwmRNueHanPx+BLfyK -Cs06NQ94+WE1LyxjoZ5BKoN6z696SnGoSaEOYeElaeOGLr353A8WHsSCGmcNxCif -qkM4zx3U/YvCVy7tRyTq+RazLPSOdL2dsm1F2VtncxAY0eFDaJGn/t9oC7sR7ssU -GnzrAoGBAN5f5Ddgg5HCqeXpjaQ5R2mRqJfdy8YaliMgBxoYoBYsQbmQdUXYmpzj -EJGuDpjuC3ZRPvSXSspFhtAoSiwjWJfj1XxClOJpa5mCbeLP2WIhAQUpBHSk4oAd -KeUhd0e7Dvk7MsSsshxRYkCU42RbG+8AgZD3jqtrduWXd+SzWMtfAoGBAM5rHlpg -Whgx41Jmq/D2gCIYwdjK8TSlKaWRd2UwG1fKEosd1tIGYDn4j+cMBmsqlrnjKyZv -jgeFeWtUFykAWnQyQFWwE2N+3zvk0Wb70oPtdX1Jg23ZXfc0sLuw0IB71uIiYUZl -xuUILrajuMl+zvbxBaJxkTcA+Z056S3ohPHLAoGBAJIhwds/bGcZhZcV0ht2GPw7 -JaWgYVZL/EL3yicXfySDe6XT9Usn8JL7nSyIUrxEqHJSpbaskDvHSfaA4EjkBwS6 -SnY6YdadDDGte2kpgDkroZWtPXE5JyD9OMnFiOX+lM+qjxOHbbrWZSMgAySw5nh8 -rOo8R8+7pedU6GMWxVJxAoGAC8ubVZ8bF1NO0YI1tf91CUM+RucGeAlwGBbw4TXy -7xLcfPpkDABdRSQleuq+icfrWxRLm8vcOvGvKrRZGEkpvX824FM0TtQMwZgL90GX -ADl0bY8sFOfZe9cgCrmlg69OG4zvnZ9qc3zPeCac2FBjmRUWQ8v5q18kNN683g1J -bOcCgYAR9gmbrM/VYARfbi6e6OQHud8iVsFRXMES8lDkX9zeusbzJCxxboa/Z9zW -+4wAHlKag+JuJkjgKdj6t+N8OGV5NQUoveUeO1el78aXqiLOqhOjtmQdW95UkPgz -PMqnknIO8EdRAnzMe66XNR9IWOO4tmoLBCzyldQNQPKnERnmxA== ------END RSA PRIVATE KEY----- diff --git a/addons/ssh/id_deploy.pub b/addons/ssh/id_deploy.pub deleted file mode 100644 index 294f5089..00000000 --- a/addons/ssh/id_deploy.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAs042FrD2J189SdM1FiikSIQh5XCE/zFQjJw4oBPJ8ywrPN2j2C5wV5esXUJyO6/iMyJlf/2ht6DvzFKeOnXEgUvSuLeLVso5bnsgrWS+0hIRlylld7s+ovfCL7VYMRV5KvO1Is0z3MamHLHVZ6SpMf04cJ987YCA2tiYxqrQHCYTnbhSPocGYj5SODSncTMaTp8CVIH9HlEr+Iw6PLXZQIxQlA0a9zT3l5bU2R2ugREQHBarcZmHVU75KEZrnLc2d8wSnZUke1wBBf1aXy7da/njSSROTv+bwTe2qPMJUYdqrVOfmHKLX23x2iP6qMejySpdKMjoOYGeS4f6w9mzVQ== ejeanvoi@tostaky