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/deploy_env_generation/.gitignore b/addons/deploy_env_generation/.gitignore new file mode 100644 index 00000000..06cf8034 --- /dev/null +++ b/addons/deploy_env_generation/.gitignore @@ -0,0 +1,3 @@ +kernel/ +.vagrant/ +debirf-wheezy/kadeploy-deploy-kernel/.fakeroot-state.debirf-kadeploy-deploy-kernel diff --git a/addons/deploy_env_generation/README.md b/addons/deploy_env_generation/README.md new file mode 100644 index 00000000..c8193c5b --- /dev/null +++ b/addons/deploy_env_generation/README.md @@ -0,0 +1,31 @@ +This is deprecated: kadeploy3 deploy kernel are now build with kameleon. +See: https://github.com/oar-team/kameleon-recipes/tree/master/kadeploy3_deploy_kernel_from_scratch + + +# Grid5000 deployment kernel generation + +## Create the vagrant virtual machine + + $ vagrant up + $ vagrant ssh + +## Gerenate kernel + + $ sudo su - + $ cd /vagrant/debirf-wheezy + $ make all + +Kernel files will be available into `kernel` directory, ready to copy on kadeploy servers into `/var/lib/tftpboot/kernels` + +## Release a new version + +Edit the file `debirf-wheezy/version` before generation. +Commit changes and : + + $ git add debirf-wheezy/version + $ git commit -m "Release debirf-wheezy 1.0.1" + $ git tags debirf-wheezy-1.0.1 + $ git push + $ git push tags + + diff --git a/addons/deploy_env_generation/Vagrantfile b/addons/deploy_env_generation/Vagrantfile new file mode 100644 index 00000000..44aad0f0 --- /dev/null +++ b/addons/deploy_env_generation/Vagrantfile @@ -0,0 +1,11 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +# Vagrantfile API/syntax version. Don't touch unless you know what you're doing! +VAGRANTFILE_API_VERSION = "2" + +Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| + config.vm.box = "irisa_debian-8.0" + config.vm.box_url = "https://vagrant.irisa.fr/boxes/irisa_debian-8.0.box" + config.vm.provision "shell", path: "script.sh" +end 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..4735d954 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 @@ -13,14 +13,14 @@ DEBIRF_LABEL="debirf-kadeploy-deploy-kernel" # What suite should be used? On Ubuntu systems the default it # "karmic", otherwise the default is "squeeze". # -#DEBIRF_SUITE= +DEBIRF_SUITE="jessie" # The default distro (eg. "debian" or "ubuntu") is based on the distro # of the suite specified. If you want to use a suite from a # non-Debian/Ubuntu distro, specify the distro explicitly here (all # lowercase). # -#DEBIRF_DISTRO= +DEBIRF_DISTRO="debian" # What mirror should debirf pull the suite from? By default, this is # based on the DEBIRF_DISTRO @@ -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 diff --git a/addons/deploy_env_generation/debirf-jessie/kadeploy-deploy-kernel/modules/kadeploy-addons b/addons/deploy_env_generation/debirf-jessie/kadeploy-deploy-kernel/modules/kadeploy-addons index a714d316..0e707e78 100755 --- a/addons/deploy_env_generation/debirf-jessie/kadeploy-deploy-kernel/modules/kadeploy-addons +++ b/addons/deploy_env_generation/debirf-jessie/kadeploy-deploy-kernel/modules/kadeploy-addons @@ -72,3 +72,5 @@ debirf_exec ln -s "/lib/systemd/system/rc-local.service" "/etc/systemd/system/rc mkdir -p $DEBIRF_ROOT/root/.ssh cat $DEBIRF_BUILDD/kadeploy_specific/ssh/*.pub >> $DEBIRF_ROOT/root/.ssh/authorized_keys + +debirf_exec apt-get -y install firmware-bnx2 firmware-bnx2x \ No newline at end of file diff --git a/addons/deploy_env_generation/debirf-wheezy/Makefile b/addons/deploy_env_generation/debirf-wheezy/Makefile new file mode 100644 index 00000000..10a0d769 --- /dev/null +++ b/addons/deploy_env_generation/debirf-wheezy/Makefile @@ -0,0 +1,20 @@ +MODULES_DIR:=/usr/share/debirf/modules/ +MODULES:=a0_add_extra_repos a0_motd network serial-terminal z1_clean-root a0_prep-root z0_remove-locales +MAKEFILE_PATH:=$(shell pwd) +VERSION:=$(shell cat ${MAKEFILE_PATH}/version) + +all: modlinks build copy + +modlinks: + cp -R kadeploy-deploy-kernel /tmp + @$(foreach module,$(MODULES), ln -sf $(MODULES_DIR)$(module) /tmp/kadeploy-deploy-kernel/modules;) + +build: + debirf make -r /tmp/kadeploy-deploy-kernel + +clean: + (cd /tmp/kadeploy-deploy-kernel ; find -maxdepth 1 -mindepth 1 ! -iname 'kadeploy_specific' ! -iname 'modules' ! -iname 'debirf.conf' -exec rm -rf '{}' \+) + +copy: + mv /tmp/kadeploy-deploy-kernel/debirf-kadeploy-deploy-kernel_wheezy_3.2.0-4-amd64.cgz /vagrant/kernel/deploy-wheezy-initrd-$(VERSION)-g5k + mv /tmp/kadeploy-deploy-kernel/vmlinuz-3.2.0-4-amd64 /vagrant/kernel/deploy-wheezy-vmlinuz-$(VERSION)-g5k diff --git a/addons/deploy_env_generation/debirf/README b/addons/deploy_env_generation/debirf-wheezy/README similarity index 100% rename from addons/deploy_env_generation/debirf/README rename to addons/deploy_env_generation/debirf-wheezy/README diff --git a/addons/deploy_env_generation/debirf/kadeploy-deploy-kernel/debirf.conf b/addons/deploy_env_generation/debirf-wheezy/kadeploy-deploy-kernel/debirf.conf similarity index 93% rename from addons/deploy_env_generation/debirf/kadeploy-deploy-kernel/debirf.conf rename to addons/deploy_env_generation/debirf-wheezy/kadeploy-deploy-kernel/debirf.conf index dfdc6df2..25f244c5 100644 --- a/addons/deploy_env_generation/debirf/kadeploy-deploy-kernel/debirf.conf +++ b/addons/deploy_env_generation/debirf-wheezy/kadeploy-deploy-kernel/debirf.conf @@ -13,14 +13,14 @@ DEBIRF_LABEL="debirf-kadeploy-deploy-kernel" # What suite should be used? On Ubuntu systems the default it # "karmic", otherwise the default is "squeeze". # -#DEBIRF_SUITE= +DEBIRF_SUITE="wheezy" # The default distro (eg. "debian" or "ubuntu") is based on the distro # of the suite specified. If you want to use a suite from a # non-Debian/Ubuntu distro, specify the distro explicitly here (all # lowercase). # -#DEBIRF_DISTRO= +DEBIRF_DISTRO="debian" # What mirror should debirf pull the suite from? By default, this is # based on the DEBIRF_DISTRO @@ -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,ufsutils,ntfsprogs,fsarchiver,ruby,libnet-ssh2-ruby,libnet-ssh-multi-ruby,libdaemons-ruby +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,ufsutils,ntfsprogs,fsarchiver,ruby,libnet-ssh2-ruby,libnet-ssh-multi-ruby,libdaemons-ruby,lvm2,btrfs-tools,xfsprogs export EXCLUDE=$EXCLUDE,vim-common,vim-tiny,laptop-detect,wget,network-manager,dhcpcd diff --git a/addons/deploy_env_generation/debirf-wheezy/kadeploy-deploy-kernel/kadeploy_specific/megaraid_sas-06.806.08.00-1_Debian7.0.amd64.deb b/addons/deploy_env_generation/debirf-wheezy/kadeploy-deploy-kernel/kadeploy_specific/megaraid_sas-06.806.08.00-1_Debian7.0.amd64.deb new file mode 100644 index 00000000..3d7a1168 Binary files /dev/null and b/addons/deploy_env_generation/debirf-wheezy/kadeploy-deploy-kernel/kadeploy_specific/megaraid_sas-06.806.08.00-1_Debian7.0.amd64.deb differ diff --git a/addons/deploy_env_generation/debirf/kadeploy-deploy-kernel/kadeploy_specific/scripts/bittorrent b/addons/deploy_env_generation/debirf-wheezy/kadeploy-deploy-kernel/kadeploy_specific/scripts/bittorrent similarity index 100% rename from addons/deploy_env_generation/debirf/kadeploy-deploy-kernel/kadeploy_specific/scripts/bittorrent rename to addons/deploy_env_generation/debirf-wheezy/kadeploy-deploy-kernel/kadeploy_specific/scripts/bittorrent diff --git a/addons/deploy_env_generation/debirf-wheezy/kadeploy-deploy-kernel/modules/a0_add_backports b/addons/deploy_env_generation/debirf-wheezy/kadeploy-deploy-kernel/modules/a0_add_backports new file mode 100644 index 00000000..9706b433 --- /dev/null +++ b/addons/deploy_env_generation/debirf-wheezy/kadeploy-deploy-kernel/modules/a0_add_backports @@ -0,0 +1,15 @@ +#!/bin/sh -e + +# debirf module: add_backports +# + +mkdir -p "${DEBIRF_ROOT}/etc/apt/sources.list.d" + +case "${DEBIRF_DISTRO}" in + debian) + cat < "${DEBIRF_ROOT}/etc/apt/sources.list.d/backports.list" +deb ${DEBIRF_MIRROR} ${DEBIRF_SUITE}-backports main +EOF + ;; +esac + diff --git a/addons/deploy_env_generation/debirf/kadeploy-deploy-kernel/modules/blacklist_sample b/addons/deploy_env_generation/debirf-wheezy/kadeploy-deploy-kernel/modules/blacklist_sample similarity index 100% rename from addons/deploy_env_generation/debirf/kadeploy-deploy-kernel/modules/blacklist_sample rename to addons/deploy_env_generation/debirf-wheezy/kadeploy-deploy-kernel/modules/blacklist_sample diff --git a/addons/deploy_env_generation/debirf-wheezy/kadeploy-deploy-kernel/modules/install-kernel b/addons/deploy_env_generation/debirf-wheezy/kadeploy-deploy-kernel/modules/install-kernel new file mode 100644 index 00000000..974ff376 --- /dev/null +++ b/addons/deploy_env_generation/debirf-wheezy/kadeploy-deploy-kernel/modules/install-kernel @@ -0,0 +1,74 @@ +#!/bin/bash -e + +# debirf module: install-kernel +# install a kernel package, indicated by the expected environment +# variables: +# DEBIRF_PATH +# DEBIRF_ROOT +# DEBIRF_KERNEL_PACKAGE +# DEBIRF_KERNEL_FLAVOR +# +# *** REQUIRED MODULE *** +# WARNING: this module is necessary for proper functioning of debirf. +# +# The debirf scripts were written by +# Jameson Rollins +# and +# Daniel Kahn Gillmor . +# +# They are Copyright 2007, and are all released under the GPL, +# version 3 or later. + +# clear out old modules if they exist, to avoid confusion +rm -rf "$DEBIRF_ROOT/lib/modules" + +# download/copy in kernel package +if [ -z "$DEBIRF_KERNEL_PACKAGE" ] ; then + # determine kernel to install. assume arch of build host. + + # determine kernel arch. need everything after the kernel version + # and debian version + KARCH=${DEBIRF_KERNEL_FLAVOR:-$(uname -r | cut -d- -f3-)} + + # determine the full kernel version from the dependency of the + # generic linux-image-ARCH package in the debirf root (since it + # may be different than what is installed on the build host) + KNAME=$(debirf_exec apt-cache show linux-image-"$KARCH" | grep '^Depends: ' | sed 's/^Depends: //' | tr ',' '\n' | tr -d ' ' | grep ^linux-image | sort -r | head -n1) + + # download only the desired kernel package for later dpkg + # extraction. this also downloads the kernel dependencies, but + # they will not be installed, and the downloaded packages will all + # be purged in the end by the clean-root module. it would be nice + # to just use "apt-get download", but that's only supported since + # wheezy. + debirf_exec apt-get install -d -y "$KNAME" + +else + # install kernel deb if given at command line + cp "$DEBIRF_KERNEL_PACKAGE" "$DEBIRF_ROOT"/var/cache/apt/archives/ +fi + +KPKG=$(basename "$DEBIRF_ROOT"/var/cache/apt/archives/linux-image-*) + +echo "extracting kernel package $KPKG..." +debirf_exec dpkg --extract /var/cache/apt/archives/"$KPKG" / + +# install the module init tools, since they are needed for depmod +debirf_exec apt-get --assume-yes install module-init-tools + +cp $DEBIRF_BUILDD/kadeploy_specific/megaraid_sas-06.806.08.00-1_Debian7.0.amd64.deb $DEBIRF_ROOT/root +debirf_exec dpkg -i /root/megaraid_sas-06.806.08.00-1_Debian7.0.amd64.deb + +# depmod to create module list +KVERS=$(ls -1 -t "$DEBIRF_ROOT/lib/modules" | head -n1) +echo "generating modules.dep..." +debirf_exec depmod -a "$KVERS" + +# extract kernel and debian stock initrd from the build root: +mv "$DEBIRF_ROOT"/boot/vmlinu* "$DEBIRF_BUILDD" + +# remove kernel symlinks +if [ -L "$DEBIRF_ROOT"/vmlinuz ] ; then + rm "$DEBIRF_BUILDD"/vmlinuz +fi + diff --git a/addons/deploy_env_generation/debirf/kadeploy-deploy-kernel/modules/ka_udev_hack b/addons/deploy_env_generation/debirf-wheezy/kadeploy-deploy-kernel/modules/ka_udev_hack similarity index 100% rename from addons/deploy_env_generation/debirf/kadeploy-deploy-kernel/modules/ka_udev_hack rename to addons/deploy_env_generation/debirf-wheezy/kadeploy-deploy-kernel/modules/ka_udev_hack diff --git a/addons/deploy_env_generation/debirf/kadeploy-deploy-kernel/modules/kadeploy-addons b/addons/deploy_env_generation/debirf-wheezy/kadeploy-deploy-kernel/modules/kadeploy-addons similarity index 93% rename from addons/deploy_env_generation/debirf/kadeploy-deploy-kernel/modules/kadeploy-addons rename to addons/deploy_env_generation/debirf-wheezy/kadeploy-deploy-kernel/modules/kadeploy-addons index fa47a18a..b49fa8b6 100755 --- a/addons/deploy_env_generation/debirf/kadeploy-deploy-kernel/modules/kadeploy-addons +++ b/addons/deploy_env_generation/debirf-wheezy/kadeploy-deploy-kernel/modules/kadeploy-addons @@ -62,3 +62,6 @@ EOF mkdir -p $DEBIRF_ROOT/root/.ssh cat $DEBIRF_BUILDD/kadeploy_specific/ssh/*.pub >> $DEBIRF_ROOT/root/.ssh/authorized_keys + +debirf_exec apt-get -y install firmware-bnx2 firmware-bnx2x +debirf_exec apt-get -y -t wheezy-backports install tar diff --git a/addons/deploy_env_generation/debirf/kadeploy-deploy-kernel/modules/root-bashrc b/addons/deploy_env_generation/debirf-wheezy/kadeploy-deploy-kernel/modules/root-bashrc similarity index 100% rename from addons/deploy_env_generation/debirf/kadeploy-deploy-kernel/modules/root-bashrc rename to addons/deploy_env_generation/debirf-wheezy/kadeploy-deploy-kernel/modules/root-bashrc diff --git a/addons/deploy_env_generation/debirf/kadeploy-deploy-kernel/modules/z2_lighten b/addons/deploy_env_generation/debirf-wheezy/kadeploy-deploy-kernel/modules/z2_lighten old mode 100755 new mode 100644 similarity index 99% rename from addons/deploy_env_generation/debirf/kadeploy-deploy-kernel/modules/z2_lighten rename to addons/deploy_env_generation/debirf-wheezy/kadeploy-deploy-kernel/modules/z2_lighten index 6b1c3cd2..0ce8df70 --- a/addons/deploy_env_generation/debirf/kadeploy-deploy-kernel/modules/z2_lighten +++ b/addons/deploy_env_generation/debirf-wheezy/kadeploy-deploy-kernel/modules/z2_lighten @@ -15,3 +15,4 @@ cd $DEBIRF_ROOT/usr/share find -maxdepth 1 -mindepth 1 -type d ! -iname 'perl*' ! -iname 'locale' -exec rm -rf '{}' \+ + diff --git a/addons/deploy_env_generation/debirf-wheezy/version b/addons/deploy_env_generation/debirf-wheezy/version new file mode 100644 index 00000000..6d7de6e6 --- /dev/null +++ b/addons/deploy_env_generation/debirf-wheezy/version @@ -0,0 +1 @@ +1.0.2 diff --git a/addons/deploy_env_generation/debirf/Makefile b/addons/deploy_env_generation/debirf/Makefile deleted file mode 100644 index 7d388524..00000000 --- a/addons/deploy_env_generation/debirf/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -MODULES_DIR:=/usr/share/debirf/modules/ -MODULES:=a0_add_extra_repos a0_motd install-kernel network serial-terminal z1_clean-root a0_prep-root z0_remove-locales - -all: modlinks build - -modlinks: - @$(foreach module,$(MODULES), ln -sf $(MODULES_DIR)$(module) kadeploy-deploy-kernel/modules;) - -build: - debirf make -r kadeploy-deploy-kernel - -clean: - (cd kadeploy-deploy-kernel ; find -maxdepth 1 -mindepth 1 ! -iname 'kadeploy_specific' ! -iname 'modules' ! -iname 'debirf.conf' -exec rm -rf '{}' \+) diff --git a/addons/deploy_env_generation/g5k-deploy.sh b/addons/deploy_env_generation/g5k-deploy.sh new file mode 100644 index 00000000..5b18d82a --- /dev/null +++ b/addons/deploy_env_generation/g5k-deploy.sh @@ -0,0 +1,39 @@ +#!/bin/bash + +SITES="rennes nantes lille nancy luxembourg lyon grenoble sophia" + +if [ ! $# -eq 1 2; then + echo "USAGE: $0 [debirf dir] [version]" + exit 1 +fi + +DEBIRF_DIR=$1 +DEBIAN_VERSION=${DEBIRF_DIR#debirf-} +VERSION=$2 + + +kernel_parts="deploy-$DEBIAN_VERSION-initrd deploy-$DEBIAN_VERSION-vmlinuz" +for kernel_part in $kernel_parts; do + file=$DEBIRF_DIR/kernel/$kernel_part-$VERSION-g5k + if [ ! -f $file ]; then + echo "$file does not exists !" + exit 1 + fi +done + +for site in $SITES; do + echo "--> deploying on site $site..." + server=kadeploy.$site.grid5000.fr + for kernel_part in $kernel_parts; do + file=$kernel_part-$1-g5k + scp $DEBIRF_DIR/kernel/$file $server:/tmp + echo " * move $file into /var/lib/tftpboot/kernels" + ssh $server sudo mv /tmp/$file /var/lib/tftpboot/kernels + echo " * change owner on $file" + ssh $server sudo chown root.deploy /var/lib/tftpboot/kernels/$file + echo " * change mode to 755 on $file" + ssh $server sudo chmod 755 /var/lib/tftpboot/kernels/$file + done +done + + diff --git a/addons/deploy_env_generation/script.sh b/addons/deploy_env_generation/script.sh new file mode 100644 index 00000000..fe230123 --- /dev/null +++ b/addons/deploy_env_generation/script.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +apt-get update +apt-get -y install debirf + 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