From 30a87d1bbefc9c094d61cbad0fde15d56eab8d73 Mon Sep 17 00:00:00 2001
From: Nikolaus Krismer <nikolaus.krismer@uibk.ac.at>
Date: Tue, 28 Apr 2015 15:02:36 +0200
Subject: [PATCH] not sharing vagrant's home directoy anymore -> writing
bootstrap logs to dedicated log folder -> should fix the problem where
vagrant asks for password on "vagrant up"
---
Vagrantfile | 7 +++----
bootstrap.sh | 5 +++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Vagrantfile b/Vagrantfile
index 14e93f2..dd20e08 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -43,8 +43,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
end
config.trigger.after :destroy do
- info "Deleting temporary synced folders"
- run "rm -Rf home"
+ info "Deleting temporary synced log folders"
run "rm -Rf log"
end
@@ -56,9 +55,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# Setup of shared folders
config.vm.synced_folder "conf", "/setup/conf"
- config.vm.synced_folder "home", "/home/vagrant", create: true
config.vm.synced_folder "img", "/setup/img"
- config.vm.synced_folder "log", "/var/log/postgresql", create: true, owner: 26, group: 26
+ config.vm.synced_folder "log/postgresql", "/var/log/postgresql", create: true, owner: 26, group: 26
+ config.vm.synced_folder "log/bootstrap", "/var/log/vagrant_bootstrap", create: true, owner: "vagrant", group: "vagrant"
# Setup environment on startup (done using a shell script)
config.vm.provision "shell", path: "bootstrap.sh", args: ["niko", "secretPhdPassword#2014!", (isLocalMode ? "true" : "false")]
diff --git a/bootstrap.sh b/bootstrap.sh
index 3aad516..327bf86 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -93,7 +93,7 @@ DEPLOY_DIR="/opt"
DOWNLOAD_DIR="$CACHE_DIR_LOCAL/wget"
SHARED_CONF_DIR="/setup/conf"
SHARED_IMG_DIR="/setup/img"
-WORKING_DIR=`pwd`
+WORKING_DIR="/var/log/vagrant_bootstrap"
############################
# Components configuration #
@@ -449,8 +449,9 @@ echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
# Basic preparations #
############################
-cd $WORKING_DIR
mkdir -p $DOWNLOAD_DIR
+mkdir -p $WORKING_DIR
+cd $WORKING_DIR
echo "Configuring timezone"
cp /usr/share/zoneinfo/Europe/Vienna /etc/localtime >> setup_timezone.log 2>&1
--
GitLab