Merge branch 'master' of github.com:puphpet/puphpet

Conflicts: archive/puphpet/vagrant/Vagrantfile-local
JonathanStevens · Jun 25, 2015 · 5235650 · 5235650
2 parents f22c8b6 + 1405530
commit 5235650
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/archive/puphpet/vagrant/Vagrantfile-local b/archive/puphpet/vagrant/Vagrantfile-local
@@ -213,7 +213,7 @@ Vagrant.configure('2') do |config|
 
   ssh_username = !data['ssh']['username'].nil? ? data['ssh']['username'] : 'vagrant'
 
-  config.vm.provision :shell, :inline => "sed -i -e 's/\r$//' /vagrant/shell/*.sh"
+  config.vm.provision :shell, :inline => "sed -i -e 's/\r$//' /vagrant/puphpet/shell/*.sh"
   config.vm.provision 'shell' do |s|
     s.path = 'puphpet/shell/initial-setup.sh'
     s.args = '/vagrant/puphpet'