diff --git a/Vagrantfile b/Vagrantfile index 8b00872..cc0c115 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -4,7 +4,7 @@ Vagrant.configure("2") do |config| config.vm.box = "chef/ubuntu-14.04" config.vm.network :forwarded_port, guest: 8080, host: 8080 - config.vm.synced_folder ".", "/vagrant" + config.vm.synced_folder ".", "/go/src/github.com/martinp/ifconfig" config.vm.synced_folder "salt/roots/", "/srv/salt/" config.vm.provider :virtualbox do |vb| vb.customize ["modifyvm", :id, "--memory", "512"] diff --git a/salt/roots/dev.sls b/salt/roots/dev.sls index b5eb125..02bfe86 100644 --- a/salt/roots/dev.sls +++ b/salt/roots/dev.sls @@ -17,4 +17,18 @@ packages: - source: salt://files/dot.bash_profile - user: vagrant - group: vagrant - - mode: 0644 \ No newline at end of file + - mode: 0644 + +/home/vagrant/.local/bin: + file.directory: + - user: vagrant + - group: vagrant + - makedirs: true + +/go: + file.directory: + - user: vagrant + - group: vagrant + - recurse: + - user + - group diff --git a/salt/roots/files/dot.bash_profile b/salt/roots/files/dot.bash_profile index e6fb4ca..5416709 100644 --- a/salt/roots/files/dot.bash_profile +++ b/salt/roots/files/dot.bash_profile @@ -1,4 +1,3 @@ -test -d $HOME/.local/bin || mkdir -p $HOME/.local/bin -export PATH=/vagrant/bin:$HOME/.local/bin:$PATH -export GOPATH=/vagrant -cd /vagrant +export GOPATH=/go +export PATH=${GOPATH}/bin:$HOME/.local/bin:$PATH +cd ${GOPATH}/src/github.com/martinp/ifconfig diff --git a/salt/roots/golang.sls b/salt/roots/golang.sls index fde76db..6a151bd 100644 --- a/salt/roots/golang.sls +++ b/salt/roots/golang.sls @@ -2,7 +2,7 @@ curl: pkg: - installed -curl -L https://storage.googleapis.com/golang/go1.4.linux-amd64.tar.gz | tar -zxC /usr/local: +curl -L https://storage.googleapis.com/golang/go1.4.2.linux-amd64.tar.gz | tar -zxC /usr/local: cmd.run: - unless: test -d /usr/local/go diff --git a/salt/roots/top.sls b/salt/roots/top.sls index 26da56f..5779be9 100644 --- a/salt/roots/top.sls +++ b/salt/roots/top.sls @@ -2,6 +2,6 @@ base: '*': - ntp - - docker - dev - golang + - docker