Skip to content
This repository has been archived by the owner on Dec 1, 2018. It is now read-only.

Commit

Permalink
Merge pull request #60 from blinkreaction/develop
Browse files Browse the repository at this point in the history
Release v1.3.1
  • Loading branch information
Leonid Makarov committed Nov 16, 2015
2 parents bec147f + 6b2bd7d commit 394bd26
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ is_windows = Vagrant::Util::Platform.windows?
# Determine paths.
vagrant_root = File.dirname(__FILE__) # Vagrantfile location
if is_windows
vagrant_mount_point = `cygpath #{vagrant_root}`.strip! # Remove trailing \n
vagrant_mount_point = `cygpath #{vagrant_root}`.strip! # Remove trailing \n
vagrant_mount_point = vagrant_mount_point.gsub(/\/cygdrive/, '') # Remove '/cygdrive' prefix
else
vagrant_mount_point = vagrant_root
end
Expand Down Expand Up @@ -163,7 +164,7 @@ Vagrant.configure("2") do |config|
config.vm.provision "shell", run: "always" do |s|
s.inline = <<-SCRIPT
mkdir -p vagrant $2
mount -t cifs -o uid=`id -u docker`,gid=`id -g docker`,sec=ntlm,username=$3,pass=$4,dir_mode=0777,file_mode=0666 //$5/$1 $2
mount -t cifs -o uid=`id -u docker`,gid=`id -g docker`,sec=ntlm,username=$3,pass=$4,dir_mode=0777,file_mode=0777 //$5/$1 $2
SCRIPT
s.args = "#{vagrant_folder_name} #{vagrant_mount_point} #{$vconfig['synced_folders']['smb_username']} #{$vconfig['synced_folders']['smb_password']} #{host_ip}"
end
Expand Down Expand Up @@ -201,7 +202,7 @@ Vagrant.configure("2") do |config|
[:up, :reload, :resume].each do |trigger|
config.trigger.after trigger do
success "Starting background rsync-auto process..."
info "Run 'tail -f #{vagrant_root}/rsync.log' to see logs."
info "Run 'tail -f #{vagrant_root}/rsync.log' to see rsync-auto logs."
# Kill the old sync process
`kill $(pgrep -f rsync-auto) > /dev/null 2>&1 || true`
# Start a new sync process in background
Expand Down

0 comments on commit 394bd26

Please sign in to comment.