summaryrefslogtreecommitdiff
path: root/vagrant
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2016-02-26 01:45:07 -0800
committerelijah <elijah@riseup.net>2016-02-26 01:45:07 -0800
commit15ca782e3bcd22f131c2b8745d7fad118b4b8648 (patch)
treeab04c576d6024e2fce1490d00c86c4ba0ecced8e /vagrant
parent89a3cd71f50a383a5f85510193087446da0e661f (diff)
parent0206d426bd51aa4805915f6e23b53d5fdb40d738 (diff)
Merge branch 'develop' of ssh://leap.se/leap_platform into develop
Diffstat (limited to 'vagrant')
-rwxr-xr-xvagrant/configure-leap.sh4
-rwxr-xr-xvagrant/install-platform.pp7
2 files changed, 1 insertions, 10 deletions
diff --git a/vagrant/configure-leap.sh b/vagrant/configure-leap.sh
index b22756de..8751c763 100755
--- a/vagrant/configure-leap.sh
+++ b/vagrant/configure-leap.sh
@@ -24,7 +24,7 @@ chown ${USER}:${USER} ${PROVIDERDIR}
cd $PROVIDERDIR
$LEAP $OPTS new --contacts "$contacts" --domain "$provider_domain" --name "$provider_name" --platform=/vagrant .
-$SUDO echo -e '\n@log = "/var/log/leap/deploy.log"' >> Leapfile
+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 ''
@@ -61,10 +61,8 @@ gem install rake
$LEAP $OPTS -v 2 deploy
-set +e
$GIT add .
$GIT commit -m'initialized and deployed provider'
-set -e
# Vagrant: leap_mx fails to start on jessie
# https://leap.se/code/issues/7755
diff --git a/vagrant/install-platform.pp b/vagrant/install-platform.pp
index 8d177156..223853c1 100755
--- a/vagrant/install-platform.pp
+++ b/vagrant/install-platform.pp
@@ -1,13 +1,6 @@
class {'apt': }
Exec['update_apt'] -> Package <||>
-
-if $::lsbdistcodename == 'wheezy' {
- package { 'ruby-hiera-puppet':
- ensure => installed
- }
-}
-
# install leap_cli from source, so it will work with the develop
# branch of leap_platform
class { '::leap::cli::install':