diff options
| author | elijah <elijah@riseup.net> | 2016-02-26 09:48:32 -0800 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2016-02-26 09:48:32 -0800 |
| commit | b3d104421aa512cd0fed72eb6e5e7387a620e6ac (patch) | |
| tree | d3a425a80d8f832778aedddea61f31b4b72dca18 | |
| parent | bfca1b32e33ccd0f5130bae546148529a3642cc3 (diff) | |
| parent | c161ce8236386bfcb5c86b62e3a1fc6bd9c0cd1b (diff) | |
Merge branch 'develop' of ssh://leap.se/leap_platform into develop
| m--------- | puppet/modules/apache | 0 | ||||
| m--------- | puppet/modules/apt | 0 | ||||
| -rwxr-xr-x | vagrant/configure-leap.sh | 2 |
3 files changed, 1 insertions, 1 deletions
diff --git a/puppet/modules/apache b/puppet/modules/apache -Subproject 41815f55ec7187a75aec4717c78270593f9776d +Subproject 117bed9a9263c21d253d86b667eb165948efdc2 diff --git a/puppet/modules/apt b/puppet/modules/apt -Subproject d997142b0cb55b23ed85ee32bbbb72d4456465d +Subproject 33c61e8df59db1abbed379a9e9790946060a8f1 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 |