Skip to content

Commit

Permalink
Update Vagrant and Puppet to work out of the box
Browse files Browse the repository at this point in the history
  • Loading branch information
mvriel committed Jul 2, 2013
1 parent 34d8254 commit e4a2d17
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
url = https://github.com/willdurand/puppet-composer.git
[submodule ".puppet/modules/php"]
path = .puppet/modules/php
url = https://github.com/saz/puppet-php.git
url = https://github.com/example42/puppet-php.git
7 changes: 4 additions & 3 deletions .puppet/manifests/phpdoc.pp
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@
node default {
File { owner => 0, group => 0, mode => 0644 }
file { '/etc/motd':
content => "Welcome to your Vagrant-built virtual machine! Managed by Puppet.\n"
content => "Welcome to the Development Environment of phpDocumentor2"
}

exec { "apt-get update":
exec { "apt-update":
command => "/usr/bin/apt-get update"
}
Exec["apt-update"] -> Package <| |>

include phpdocumentor
}
}
3 changes: 2 additions & 1 deletion .puppet/modules/phpdocumentor/manifests/setup.pp
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
include php
php::module { "xsl": }
php::module { "intl": }
php::module { "xdebug": }

class { 'composer':
command_name => 'composer',
Expand All @@ -26,4 +27,4 @@
require => [ Package["python-setuptools"] ],
timeout => 0
}
}
}
3 changes: 2 additions & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ Vagrant::Config.run do |config|
config.vm.box = "precise64"
config.vm.box_url = "http://files.vagrantup.com/precise64.box"
config.vm.share_folder(
"v-root",
"vagrant-root",
"/vagrant",
".",
:nfs => (RUBY_PLATFORM =~ /linux/ or RUBY_PLATFORM =~ /darwin/)
)
config.vm.network :hostonly, "192.168.255.2"
config.vm.host_name = "dev.app.phpdoc.org"

config.vm.provision :puppet do |puppet|
puppet.module_path = ".puppet/modules"
Expand Down

0 comments on commit e4a2d17

Please sign in to comment.