From f3575cbf80312bd29da9c3c9756f2d5f276be5ed Mon Sep 17 00:00:00 2001 From: varac Date: Fri, 26 Feb 2016 13:12:27 +0100 Subject: Update submodules apache and apt --- puppet/modules/apache | 2 +- puppet/modules/apt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/puppet/modules/apache b/puppet/modules/apache index 41815f55..117bed9a 160000 --- a/puppet/modules/apache +++ b/puppet/modules/apache @@ -1 +1 @@ -Subproject commit 41815f55ec7187a75aec4717c78270593f9776de +Subproject commit 117bed9a9263c21d253d86b667eb165948efdc24 diff --git a/puppet/modules/apt b/puppet/modules/apt index d997142b..33c61e8d 160000 --- a/puppet/modules/apt +++ b/puppet/modules/apt @@ -1 +1 @@ -Subproject commit d997142b0cb55b23ed85ee32bbbb72d4456465d1 +Subproject commit 33c61e8df59db1abbed379a9e9790946060a8f1e -- cgit v1.2.3 From c161ce8236386bfcb5c86b62e3a1fc6bd9c0cd1b Mon Sep 17 00:00:00 2001 From: varac Date: Fri, 26 Feb 2016 13:32:52 +0100 Subject: only create /root/.ssh if it doesnt exist --- vagrant/configure-leap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vagrant/configure-leap.sh b/vagrant/configure-leap.sh index 8751c763..08752128 100755 --- a/vagrant/configure-leap.sh +++ b/vagrant/configure-leap.sh @@ -28,7 +28,7 @@ echo -e '\n@log = "./deploy.log"' >> Leapfile if [ ! -e /home/${USER}/.ssh/id_rsa ]; then $SUDO ssh-keygen -f /home/${USER}/.ssh/id_rsa -P '' - mkdir /root/.ssh + [ -d /root/.ssh ] || mkdir /root/.ssh cat /home/${USER}/.ssh/id_rsa.pub >> /root/.ssh/authorized_keys fi -- cgit v1.2.3