Skip to content
This repository was archived by the owner on Oct 26, 2018. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ Vagrant.configure("2") do |config|
v.customize ["modifyvm", :id, "--memory", 512]
end

config.vm.box = "raring-1304"
config.vm.box_url = "http://cloud-images.ubuntu.com/vagrant/raring/current/raring-server-cloudimg-i386-vagrant-disk1.box"
config.vm.box = "raring-1310"
config.vm.box_url = "http://brennovich.s3.amazonaws.com/saucy64_vmware_fusion.box"

config.vm.hostname = "salty-wordpress"
config.vm.network :private_network, ip: "192.168.50.10"
Expand All @@ -32,7 +32,7 @@ Vagrant.configure("2") do |config|
config.ssh.max_tries = 150
end

nfs = Kernel.is_mac?
nfs = false
config.vm.synced_folder "config", "/home/vagrant/config", :nfs => nfs
config.vm.synced_folder "projects", "/srv/www", :nfs => nfs

Expand Down
18 changes: 18 additions & 0 deletions config/salt/hhvm.sls
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
hhvm-ppa:
pkgrepo.managed:
- humanname: HHVM PPA
- name: deb http://dl.hhvm.com/ubuntu/ saucy main
- require_in:
- git

- require_in:
- hhvm
- hhvm-fastcgi

hhvm:
pkg.installed:
- skip_verify: True

hhvm-fastcgi:
pk.installed:
- skip_verify: True
2 changes: 1 addition & 1 deletion config/salt/tools.sls
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ htop:
wp_cli:
cmd.run:
- name: curl https://raw.github.com/wp-cli/wp-cli.github.com/master/installer.sh | bash
- unless: which wp
- unless: which /usr/bin/wp
- user: {{ grains['user'] }}
- require:
- pkg: php5-cli
Expand Down
1 change: 1 addition & 0 deletions config/salt/top.sls
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ base:
- nginx
- php_fpm
- postfix
- hhvm

'salty-wordpress':
- vagrant
Expand Down