Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#451: replace 'configure_php.pp' with 'site.pp' #556

Merged
merged 1 commit into from
Dec 5, 2017
Merged
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
19 changes: 10 additions & 9 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,16 @@ Vagrant.configure(2) do |config|
puppet.manifest_file = 'configure_httpd.pp'
end

## Custom Manifest: install, and configure php (required before drush)
#
# Note: future parser allow array iteration in the puppet manifest
config.vm.provision "puppet" do |puppet|
puppet.environment_path = 'puppet/environment'
puppet.environment = 'development'
puppet.manifests_path = 'puppet/environment/development/manifests'
puppet.module_path = 'puppet/environment/development/modules_contrib'
puppet.manifest_file = "configure_php.pp"
## Custom Manifest: install needed packages
config.vm.provision 'puppet' do |puppet|
puppet.environment_path = 'puppet/environment'
puppet.environment = 'development'
puppet.manifests_path = 'puppet/environment/development/manifests'
puppet.module_path = [
'puppet/environment/development/modules_contrib',
'puppet/environment/development/modules',
]
puppet.manifest_file = 'site.pp'
end

## Custom Manifest: install drush
Expand Down
234 changes: 0 additions & 234 deletions puppet/environment/development/manifests/configure_php.pp

This file was deleted.

5 changes: 5 additions & 0 deletions puppet/environment/development/manifests/site.pp
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
###
### site.pp: load all necessary modules.
###

contain php