From 8ed1dce4b11cdc5e98f34e0e05f9e90e903a5eeb Mon Sep 17 00:00:00 2001
From: Lucas Bickel <hairmare@rabe.ch>
Date: Mon, 6 Mar 2017 12:03:11 +0100
Subject: [PATCH] Install airtime in vagrant env

Uses the old installer to get LibreTime installed quick and dirty on vagrant.

It uses the `install -fIap` command that does a local install and points the apache config
directly to the local working copy mounted in /vagrant.

While we don't have fancy autoloading for libretime like the docs do, this way
it's already easy to work against a local branch.

I'm not sure if the `-I` arg to the installer also covers the python parts of libretime.
---
 Vagrantfile   | 2 ++
 docs/index.md | 2 ++
 install       | 9 +++++++--
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 628fe3c35..8f4b84c86 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -5,8 +5,10 @@ Vagrant.configure("2") do |config|
 
   config.vm.box = "ubuntu/trusty64"
 
+  config.vm.network "forwarded_port", guest:   80, host:8080
   config.vm.network "forwarded_port", guest: 8888, host:8888
 
+  config.vm.provision "shell", inline: "cd /vagrant; ./install -fIap"
   config.vm.provision "shell", path: "docs/scripts/install.sh"
   config.vm.provision "shell", path: "docs/scripts/serve.sh"
 
diff --git a/docs/index.md b/docs/index.md
index 6dfb154c2..66bd2740f 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -22,4 +22,6 @@ The easiest way to check out LibreTime for yourself is to run a local instance i
     cd libretime
     vagrant up
 
+If everything works out, you will find LibreTime on [port 8080](http://localhost:8080) and the docs on [port 8888](http://localhost:8888).
+
 Of course, this setup isn't appropriate for production use. For that, check out our [installation instructions](install.md).
diff --git a/install b/install
index ea5b70f75..b668296c4 100755
--- a/install
+++ b/install
@@ -305,11 +305,17 @@ if [ "$ignore_dependencies" = "f" ]; then
     else
         loudCmd "DEBIAN_FRONTEND=noninteractive apt-get -y -m --force-yes install $(grep -vE '^\s*#' ${SCRIPT_DIR}/installer/lib/requirements-ubuntu-trusty.apt | tr '\n' ' ')"
     fi
+    if [ "$in_place" = "t" ]; then
+        loudCmd "DEBIAN_FRONTEND=noninteractive apt-get -y -m --force-yes install git"
+    fi
     set -e
 else
     checkCommandExists "apache2"
     checkCommandExists "rabbitmqctl"
     checkCommandExists "psql"
+    if [ "$in_place" = "t" ]; then
+        checkCommandExists "git"
+    fi
 fi
 
 # Check if composer exists and install if it doesn't
@@ -606,8 +612,7 @@ if [ ! -d "/etc/airtime" ]; then
 
     verbose "\n * Creating /etc/airtime/ directory..."
     mkdir /etc/airtime
-    verbose "\n * Creating /etc/airtime-saas/ directory..."
-    # Default saas directory for the analyzer, cloud storage, and celery
+    # workaround for reintegrated airtime-saas dir, will get removed after we refactored config loading
     ln -s /etc/airtime/ /etc/airtime/production
     # put the default cloud_storage.conf using local file storage into directory
     cp ${AIRTIMEROOT}/airtime_mvc/build/cloud_storage.conf /etc/airtime/cloud_storage.conf