Skip to content

php_frameworks
php_frameworks
Commit 91608d3b authored by Yoshiharu Hirose's avatar Yoshiharu Hirose
Browse files
Options

Puppet 4 対応

parent a17f0e1f
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 42 deletions
cakephp3/Vagrantfile
View file @ 91608d3b
...@@ -70,7 +70,6 @@ Vagrant.configure(2) do |config| ...@@ -70,7 +70,6 @@ Vagrant.configure(2) do |config|
# SHELL # SHELL
config.vm.box = "puppetlabs/centos-6.6-64-puppet" config.vm.box = "puppetlabs/centos-6.6-64-puppet"
config.vm.box_version = "1.0.1"
if ENV['HTTP_PROXY'] || ENV['HTTPS_PROXY'] if ENV['HTTP_PROXY'] || ENV['HTTPS_PROXY']
unless Vagrant.has_plugin?("vagrant-proxyconf") unless Vagrant.has_plugin?("vagrant-proxyconf")
...@@ -84,7 +83,7 @@ Vagrant.configure(2) do |config| ...@@ -84,7 +83,7 @@ Vagrant.configure(2) do |config|
config.vm.hostname = "www" config.vm.hostname = "www"
config.vm.network :forwarded_port, guest: 80, host: 8000 config.vm.network :forwarded_port, guest: 80, host: 8000
config.vm.provision :puppet do |puppet| config.vm.provision :puppet do |puppet|
puppet.manifests_path = 'puppet/manifests' puppet.environment = "development"
puppet.options = ["--templatedir", "/vagrant/puppet/templates"] puppet.environment_path = "puppet/environment"
end end
end end
cakephp3/puppet/manifests/default.pp → cakephp3/puppet/environment/development/manifests/default.pp
View file @ 91608d3b
...@@ -54,13 +54,13 @@ service { 'httpd': ...@@ -54,13 +54,13 @@ service { 'httpd':
} }
file { '/etc/httpd/conf/httpd.conf': file { '/etc/httpd/conf/httpd.conf':
ensure => file, ensure => file,
content => template('httpd.conf'), content => template('apache/httpd.conf'),
require => Package['httpd'], require => Package['httpd'],
notify => Service['httpd'], notify => Service['httpd'],
} }
file { '/etc/httpd/conf.d/vhost.conf': file { '/etc/httpd/conf.d/vhost.conf':
ensure => file, ensure => file,
content => template('vhosts.conf'), content => template('apache/vhosts.conf'),
require => Package['httpd'], require => Package['httpd'],
notify => Service['httpd'], notify => Service['httpd'],
} }
...@@ -78,7 +78,7 @@ exec { 'php-xdebug': ...@@ -78,7 +78,7 @@ exec { 'php-xdebug':
} }
file { '/etc/php.ini': file { '/etc/php.ini':
ensure => file, ensure => file,
content => template('php.ini'), content => template('apache/php.ini'),
notify => Service['httpd'], notify => Service['httpd'],
} }
......
codeigniter3/Vagrantfile
View file @ 91608d3b
...@@ -70,7 +70,6 @@ Vagrant.configure(2) do |config| ...@@ -70,7 +70,6 @@ Vagrant.configure(2) do |config|
# SHELL # SHELL
config.vm.box = "puppetlabs/centos-6.6-64-puppet" config.vm.box = "puppetlabs/centos-6.6-64-puppet"
config.vm.box_version = "1.0.1"
if ENV['HTTP_PROXY'] || ENV['HTTPS_PROXY'] if ENV['HTTP_PROXY'] || ENV['HTTPS_PROXY']
unless Vagrant.has_plugin?("vagrant-proxyconf") unless Vagrant.has_plugin?("vagrant-proxyconf")
...@@ -84,7 +83,7 @@ Vagrant.configure(2) do |config| ...@@ -84,7 +83,7 @@ Vagrant.configure(2) do |config|
config.vm.hostname = "www" config.vm.hostname = "www"
config.vm.network :forwarded_port, guest: 80, host: 8000 config.vm.network :forwarded_port, guest: 80, host: 8000
config.vm.provision :puppet do |puppet| config.vm.provision :puppet do |puppet|
puppet.manifests_path = 'puppet/manifests' puppet.environment = "development"
puppet.options = ["--templatedir", "/vagrant/puppet/templates"] puppet.environment_path = "puppet/environment"
end end
end end
codeigniter3/puppet/manifests/default.pp → codeigniter3/puppet/environment/development/manifests/default.pp
View file @ 91608d3b
...@@ -54,13 +54,13 @@ service { 'httpd': ...@@ -54,13 +54,13 @@ service { 'httpd':
} }
file { '/etc/httpd/conf/httpd.conf': file { '/etc/httpd/conf/httpd.conf':
ensure => file, ensure => file,
content => template('httpd.conf'), content => template('apache/httpd.conf'),
require => Package['httpd'], require => Package['httpd'],
notify => Service['httpd'], notify => Service['httpd'],
} }
file { '/etc/httpd/conf.d/vhost.conf': file { '/etc/httpd/conf.d/vhost.conf':
ensure => file, ensure => file,
content => template('vhosts.conf'), content => template('apache/vhosts.conf'),
require => Package['httpd'], require => Package['httpd'],
notify => Service['httpd'], notify => Service['httpd'],
} }
...@@ -78,7 +78,7 @@ exec { 'php-xdebug': ...@@ -78,7 +78,7 @@ exec { 'php-xdebug':
} }
file { '/etc/php.ini': file { '/etc/php.ini':
ensure => file, ensure => file,
content => template('php.ini'), content => template('apache/php.ini'),
notify => Service['httpd'], notify => Service['httpd'],
} }
......
curry/Vagrantfile
View file @ 91608d3b
...@@ -70,7 +70,6 @@ Vagrant.configure(2) do |config| ...@@ -70,7 +70,6 @@ Vagrant.configure(2) do |config|
# SHELL # SHELL
config.vm.box = "puppetlabs/centos-6.6-64-puppet" config.vm.box = "puppetlabs/centos-6.6-64-puppet"
config.vm.box_version = "1.0.1"
if ENV['HTTP_PROXY'] || ENV['HTTPS_PROXY'] if ENV['HTTP_PROXY'] || ENV['HTTPS_PROXY']
unless Vagrant.has_plugin?("vagrant-proxyconf") unless Vagrant.has_plugin?("vagrant-proxyconf")
...@@ -84,7 +83,7 @@ Vagrant.configure(2) do |config| ...@@ -84,7 +83,7 @@ Vagrant.configure(2) do |config|
config.vm.hostname = "www" config.vm.hostname = "www"
config.vm.network :forwarded_port, guest: 80, host: 8000 config.vm.network :forwarded_port, guest: 80, host: 8000
config.vm.provision :puppet do |puppet| config.vm.provision :puppet do |puppet|
puppet.manifests_path = 'puppet/manifests' puppet.environment = "development"
puppet.options = ["--templatedir", "/vagrant/puppet/templates"] puppet.environment_path = "puppet/environment"
end end
end end
curry/puppet/manifests/default.pp → curry/puppet/environment/development/manifests/default.pp
View file @ 91608d3b
...@@ -54,13 +54,13 @@ service { 'httpd': ...@@ -54,13 +54,13 @@ service { 'httpd':
} }
file { '/etc/httpd/conf/httpd.conf': file { '/etc/httpd/conf/httpd.conf':
ensure => file, ensure => file,
content => template('httpd.conf'), content => template('apache/httpd.conf'),
require => Package['httpd'], require => Package['httpd'],
notify => Service['httpd'], notify => Service['httpd'],
} }
file { '/etc/httpd/conf.d/vhost.conf': file { '/etc/httpd/conf.d/vhost.conf':
ensure => file, ensure => file,
content => template('vhosts.conf'), content => template('apache/vhosts.conf'),
require => Package['httpd'], require => Package['httpd'],
notify => Service['httpd'], notify => Service['httpd'],
} }
...@@ -78,7 +78,7 @@ exec { 'php-xdebug': ...@@ -78,7 +78,7 @@ exec { 'php-xdebug':
} }
file { '/etc/php.ini': file { '/etc/php.ini':
ensure => file, ensure => file,
content => template('php.ini'), content => template('apache/php.ini'),
notify => Service['httpd'], notify => Service['httpd'],
} }
......
fuelphp/Vagrantfile
View file @ 91608d3b
...@@ -70,7 +70,6 @@ Vagrant.configure(2) do |config| ...@@ -70,7 +70,6 @@ Vagrant.configure(2) do |config|
# SHELL # SHELL
config.vm.box = "puppetlabs/centos-6.6-64-puppet" config.vm.box = "puppetlabs/centos-6.6-64-puppet"
config.vm.box_version = "1.0.1"
if ENV['HTTP_PROXY'] || ENV['HTTPS_PROXY'] if ENV['HTTP_PROXY'] || ENV['HTTPS_PROXY']
unless Vagrant.has_plugin?("vagrant-proxyconf") unless Vagrant.has_plugin?("vagrant-proxyconf")
...@@ -84,7 +83,7 @@ Vagrant.configure(2) do |config| ...@@ -84,7 +83,7 @@ Vagrant.configure(2) do |config|
config.vm.hostname = "www" config.vm.hostname = "www"
config.vm.network :forwarded_port, guest: 80, host: 8000 config.vm.network :forwarded_port, guest: 80, host: 8000
config.vm.provision :puppet do |puppet| config.vm.provision :puppet do |puppet|
puppet.manifests_path = 'puppet/manifests' puppet.environment = "development"
puppet.options = ["--templatedir", "/vagrant/puppet/templates"] puppet.environment_path = "puppet/environment"
end end
end end
silex2/puppet/manifests/default.pp → fuelphp/puppet/environment/development/manifests/default.pp
View file @ 91608d3b
...@@ -54,13 +54,13 @@ service { 'httpd': ...@@ -54,13 +54,13 @@ service { 'httpd':
} }
file { '/etc/httpd/conf/httpd.conf': file { '/etc/httpd/conf/httpd.conf':
ensure => file, ensure => file,
content => template('httpd.conf'), content => template('apache/httpd.conf'),
require => Package['httpd'], require => Package['httpd'],
notify => Service['httpd'], notify => Service['httpd'],
} }
file { '/etc/httpd/conf.d/vhost.conf': file { '/etc/httpd/conf.d/vhost.conf':
ensure => file, ensure => file,
content => template('vhosts.conf'), content => template('apache/vhosts.conf'),
require => Package['httpd'], require => Package['httpd'],
notify => Service['httpd'], notify => Service['httpd'],
} }
...@@ -78,7 +78,7 @@ exec { 'php-xdebug': ...@@ -78,7 +78,7 @@ exec { 'php-xdebug':
} }
file { '/etc/php.ini': file { '/etc/php.ini':
ensure => file, ensure => file,
content => template('php.ini'), content => template('apache/php.ini'),
notify => Service['httpd'], notify => Service['httpd'],
} }
......
laravel4/Vagrantfile
View file @ 91608d3b
...@@ -70,7 +70,6 @@ Vagrant.configure(2) do |config| ...@@ -70,7 +70,6 @@ Vagrant.configure(2) do |config|
# SHELL # SHELL
config.vm.box = "puppetlabs/centos-6.6-64-puppet" config.vm.box = "puppetlabs/centos-6.6-64-puppet"
config.vm.box_version = "1.0.1"
if ENV['HTTP_PROXY'] || ENV['HTTPS_PROXY'] if ENV['HTTP_PROXY'] || ENV['HTTPS_PROXY']
unless Vagrant.has_plugin?("vagrant-proxyconf") unless Vagrant.has_plugin?("vagrant-proxyconf")
...@@ -84,7 +83,7 @@ Vagrant.configure(2) do |config| ...@@ -84,7 +83,7 @@ Vagrant.configure(2) do |config|
config.vm.hostname = "www" config.vm.hostname = "www"
config.vm.network :forwarded_port, guest: 80, host: 8000 config.vm.network :forwarded_port, guest: 80, host: 8000
config.vm.provision :puppet do |puppet| config.vm.provision :puppet do |puppet|
puppet.manifests_path = 'puppet/manifests' puppet.environment = "development"
puppet.options = ["--templatedir", "/vagrant/puppet/templates"] puppet.environment_path = "puppet/environment"
end end
end end
laravel4/puppet/manifests/default.pp → laravel4/puppet/environment/development/manifests/default.pp
View file @ 91608d3b
...@@ -54,13 +54,13 @@ service { 'httpd': ...@@ -54,13 +54,13 @@ service { 'httpd':
} }
file { '/etc/httpd/conf/httpd.conf': file { '/etc/httpd/conf/httpd.conf':
ensure => file, ensure => file,
content => template('httpd.conf'), content => template('apache/httpd.conf'),
require => Package['httpd'], require => Package['httpd'],
notify => Service['httpd'], notify => Service['httpd'],
} }
file { '/etc/httpd/conf.d/vhost.conf': file { '/etc/httpd/conf.d/vhost.conf':
ensure => file, ensure => file,
content => template('vhosts.conf'), content => template('apache/vhosts.conf'),
require => Package['httpd'], require => Package['httpd'],
notify => Service['httpd'], notify => Service['httpd'],
} }
...@@ -78,7 +78,7 @@ exec { 'php-xdebug': ...@@ -78,7 +78,7 @@ exec { 'php-xdebug':
} }
file { '/etc/php.ini': file { '/etc/php.ini':
ensure => file, ensure => file,
content => template('php.ini'), content => template('apache/php.ini'),
notify => Service['httpd'], notify => Service['httpd'],
} }
......
silex2/Vagrantfile
View file @ 91608d3b
...@@ -70,7 +70,6 @@ Vagrant.configure(2) do |config| ...@@ -70,7 +70,6 @@ Vagrant.configure(2) do |config|
# SHELL # SHELL
config.vm.box = "puppetlabs/centos-6.6-64-puppet" config.vm.box = "puppetlabs/centos-6.6-64-puppet"
config.vm.box_version = "1.0.1"
if ENV['HTTP_PROXY'] || ENV['HTTPS_PROXY'] if ENV['HTTP_PROXY'] || ENV['HTTPS_PROXY']
unless Vagrant.has_plugin?("vagrant-proxyconf") unless Vagrant.has_plugin?("vagrant-proxyconf")
...@@ -84,7 +83,7 @@ Vagrant.configure(2) do |config| ...@@ -84,7 +83,7 @@ Vagrant.configure(2) do |config|
config.vm.hostname = "www" config.vm.hostname = "www"
config.vm.network :forwarded_port, guest: 80, host: 8000 config.vm.network :forwarded_port, guest: 80, host: 8000
config.vm.provision :puppet do |puppet| config.vm.provision :puppet do |puppet|
puppet.manifests_path = 'puppet/manifests' puppet.environment = "development"
puppet.options = ["--templatedir", "/vagrant/puppet/templates"] puppet.environment_path = "puppet/environment"
end end
end end
fuelphp/puppet/manifests/default.pp → silex2/puppet/environment/development/manifests/default.pp
View file @ 91608d3b
...@@ -54,13 +54,13 @@ service { 'httpd': ...@@ -54,13 +54,13 @@ service { 'httpd':
} }
file { '/etc/httpd/conf/httpd.conf': file { '/etc/httpd/conf/httpd.conf':
ensure => file, ensure => file,
content => template('httpd.conf'), content => template('apache/httpd.conf'),
require => Package['httpd'], require => Package['httpd'],
notify => Service['httpd'], notify => Service['httpd'],
} }
file { '/etc/httpd/conf.d/vhost.conf': file { '/etc/httpd/conf.d/vhost.conf':
ensure => file, ensure => file,
content => template('vhosts.conf'), content => template('apache/vhosts.conf'),
require => Package['httpd'], require => Package['httpd'],
notify => Service['httpd'], notify => Service['httpd'],
} }
...@@ -78,7 +78,7 @@ exec { 'php-xdebug': ...@@ -78,7 +78,7 @@ exec { 'php-xdebug':
} }
file { '/etc/php.ini': file { '/etc/php.ini':
ensure => file, ensure => file,
content => template('php.ini'), content => template('apache/php.ini'),
notify => Service['httpd'], notify => Service['httpd'],
} }
......
symfony2/Vagrantfile
View file @ 91608d3b
...@@ -70,7 +70,6 @@ Vagrant.configure(2) do |config| ...@@ -70,7 +70,6 @@ Vagrant.configure(2) do |config|
# SHELL # SHELL
config.vm.box = "puppetlabs/centos-6.6-64-puppet" config.vm.box = "puppetlabs/centos-6.6-64-puppet"
config.vm.box_version = "1.0.1"
if ENV['HTTP_PROXY'] || ENV['HTTPS_PROXY'] if ENV['HTTP_PROXY'] || ENV['HTTPS_PROXY']
unless Vagrant.has_plugin?("vagrant-proxyconf") unless Vagrant.has_plugin?("vagrant-proxyconf")
...@@ -84,7 +83,7 @@ Vagrant.configure(2) do |config| ...@@ -84,7 +83,7 @@ Vagrant.configure(2) do |config|
config.vm.hostname = "www" config.vm.hostname = "www"
config.vm.network :forwarded_port, guest: 80, host: 8000 config.vm.network :forwarded_port, guest: 80, host: 8000
config.vm.provision :puppet do |puppet| config.vm.provision :puppet do |puppet|
puppet.manifests_path = 'puppet/manifests' puppet.environment = "development"
puppet.options = ["--templatedir", "/vagrant/puppet/templates"] puppet.environment_path = "puppet/environment"
end end
end end
symfony2/puppet/manifests/default.pp → symfony2/puppet/environment/development/manifests/default.pp
View file @ 91608d3b
...@@ -54,13 +54,13 @@ service { 'httpd': ...@@ -54,13 +54,13 @@ service { 'httpd':
} }
file { '/etc/httpd/conf/httpd.conf': file { '/etc/httpd/conf/httpd.conf':
ensure => file, ensure => file,
content => template('httpd.conf'), content => template('apache/httpd.conf'),
require => Package['httpd'], require => Package['httpd'],
notify => Service['httpd'], notify => Service['httpd'],
} }
file { '/etc/httpd/conf.d/vhost.conf': file { '/etc/httpd/conf.d/vhost.conf':
ensure => file, ensure => file,
content => template('vhosts.conf'), content => template('apache/vhosts.conf'),
require => Package['httpd'], require => Package['httpd'],
notify => Service['httpd'], notify => Service['httpd'],
} }
...@@ -78,7 +78,7 @@ exec { 'php-xdebug': ...@@ -78,7 +78,7 @@ exec { 'php-xdebug':
} }
file { '/etc/php.ini': file { '/etc/php.ini':
ensure => file, ensure => file,
content => template('php.ini'), content => template('apache/php.ini'),
notify => Service['httpd'], notify => Service['httpd'],
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment