Merge pull request #519 from Gluejar/sysadmin

update to ansible files to reflect need for libjpeg
pull/1/head
eshellman 2015-08-27 16:53:06 -04:00
commit b5cc6c7059
5 changed files with 6 additions and 2 deletions

4
vagrant/Vagrantfile vendored
View File

@ -107,7 +107,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
node.vm.box = "precise64" node.vm.box = "precise64"
#node.vm.network "private_network", type: "dhcp" #node.vm.network "private_network", type: "dhcp"
node.vm.network "private_network", ip: "192.168.33.10" node.vm.network "private_network", ip: "192.168.33.10" #https://192.168.33.10.xip.io
node.ssh.forward_agent = true node.ssh.forward_agent = true
@ -118,7 +118,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# trying to mimic https://github.com/mozilla/fxa-dev/blob/b9b6f347c786428b347b82d38fb67e2c2fd1b827/vagrant/Vagrantfile # trying to mimic https://github.com/mozilla/fxa-dev/blob/b9b6f347c786428b347b82d38fb67e2c2fd1b827/vagrant/Vagrantfile
# but this doesn't work # but this doesn't work
override.vm.provision "ansible" do |ansible| override.vm.provision "ansible" do |ansible|
ansible.playbook = 'hello2.yml' ansible.playbook = 'localvm.yml'
#ansible.start_at_task = 'remove all default enabled sites' #ansible.start_at_task = 'remove all default enabled sites'
end end

View File

@ -46,6 +46,7 @@
- redis-server - redis-server
- python-lxml - python-lxml
- python-dev - python-dev
- libjpeg-dev
- libmysqlclient-dev - libmysqlclient-dev
- libxml2-dev - libxml2-dev
- libxslt1-dev - libxslt1-dev

View File

@ -47,6 +47,7 @@
- redis-server - redis-server
- python-lxml - python-lxml
- python-dev - python-dev
- libjpeg-dev
- libmysqlclient-dev - libmysqlclient-dev
- libxml2-dev - libxml2-dev
- libxslt1-dev - libxslt1-dev

View File

@ -18,6 +18,7 @@
- redis-server - redis-server
- python-lxml - python-lxml
- python-dev - python-dev
- libjpeg-dev
- libmysqlclient-dev - libmysqlclient-dev
- libxml2-dev - libxml2-dev
- libxslt1-dev - libxslt1-dev

View File

@ -46,6 +46,7 @@
- redis-server - redis-server
- python-lxml - python-lxml
- python-dev - python-dev
- libjpeg-dev
- libmysqlclient-dev - libmysqlclient-dev
- libxml2-dev - libxml2-dev
- libxslt1-dev - libxslt1-dev