Commit b0779ee9 authored by Yoshiharu Hirose's avatar Yoshiharu Hirose

COMPOSER_HOMEを/tmp配下に変更(キャッシュをsite配下に残さないように)

parent a49c06ee
...@@ -101,14 +101,14 @@ exec { 'mysql-create-database': ...@@ -101,14 +101,14 @@ exec { 'mysql-create-database':
# Composer # Composer
exec { 'composer': exec { 'composer':
cwd => '/vagrant/www/site', cwd => '/vagrant/www/site',
environment => ['COMPOSER_HOME=/vagrant/www/site'], environment => ['COMPOSER_HOME=/tmp/composer'],
command => '/usr/bin/curl -sS https://getcomposer.org/installer | /usr/bin/php', command => '/usr/bin/curl -sS https://getcomposer.org/installer | /usr/bin/php',
unless => '/usr/bin/test -x /vagrant/www/composer.phar', unless => '/usr/bin/test -x /vagrant/www/composer.phar',
require => Package['php'] require => Package['php']
} }
exec { 'composer-install': exec { 'composer-install':
cwd => '/vagrant/www/site', cwd => '/vagrant/www/site',
environment => ['COMPOSER_HOME=/vagrant/www/site'], environment => ['COMPOSER_HOME=/tmp/composer'],
command => '/usr/bin/php composer.phar install -n --prefer-dist', command => '/usr/bin/php composer.phar install -n --prefer-dist',
timeout => 1200, timeout => 1200,
require => [Exec['composer'], Package['php', 'php-xml']] require => [Exec['composer'], Package['php', 'php-xml']]
......
...@@ -3,7 +3,4 @@ ...@@ -3,7 +3,4 @@
/tmp/* /tmp/*
/logs/* /logs/*
/cache
/composer.phar /composer.phar
/keys.dev.pub
/keys.tags.pub
...@@ -101,14 +101,14 @@ exec { 'mysql-create-database': ...@@ -101,14 +101,14 @@ exec { 'mysql-create-database':
# Composer # Composer
exec { 'composer': exec { 'composer':
cwd => '/vagrant/www/site', cwd => '/vagrant/www/site',
environment => ['COMPOSER_HOME=/vagrant/www/site'], environment => ['COMPOSER_HOME=/tmp/composer'],
command => '/usr/bin/curl -sS https://getcomposer.org/installer | /usr/bin/php', command => '/usr/bin/curl -sS https://getcomposer.org/installer | /usr/bin/php',
unless => '/usr/bin/test -x /vagrant/www/composer.phar', unless => '/usr/bin/test -x /vagrant/www/composer.phar',
require => Package['php'] require => Package['php']
} }
exec { 'composer-install': exec { 'composer-install':
cwd => '/vagrant/www/site', cwd => '/vagrant/www/site',
environment => ['COMPOSER_HOME=/vagrant/www/site'], environment => ['COMPOSER_HOME=/tmp/composer'],
command => '/usr/bin/php composer.phar install --prefer-dist', command => '/usr/bin/php composer.phar install --prefer-dist',
timeout => 1200, timeout => 1200,
require => [Exec['composer'], Package['php', 'php-xml']] require => [Exec['composer'], Package['php', 'php-xml']]
......
/cache
/composer.phar /composer.phar
/keys.dev.pub
/keys.tags.pub
/vendor /vendor
/node_modules /node_modules
Deny from all
\ No newline at end of file
...@@ -101,14 +101,14 @@ exec { 'mysql-create-database': ...@@ -101,14 +101,14 @@ exec { 'mysql-create-database':
# Composer # Composer
exec { 'composer': exec { 'composer':
cwd => '/vagrant/www/site', cwd => '/vagrant/www/site',
environment => ['COMPOSER_HOME=/vagrant/www/site'], environment => ['COMPOSER_HOME=/tmp/composer'],
command => '/usr/bin/curl -sS https://getcomposer.org/installer | /usr/bin/php', command => '/usr/bin/curl -sS https://getcomposer.org/installer | /usr/bin/php',
unless => '/usr/bin/test -x /vagrant/www/composer.phar', unless => '/usr/bin/test -x /vagrant/www/composer.phar',
require => Package['php'] require => Package['php']
} }
exec { 'composer-install': exec { 'composer-install':
cwd => '/vagrant/www/site', cwd => '/vagrant/www/site',
environment => ['COMPOSER_HOME=/vagrant/www/site'], environment => ['COMPOSER_HOME=/tmp/composer'],
command => '/usr/bin/php composer.phar install -n --prefer-dist', command => '/usr/bin/php composer.phar install -n --prefer-dist',
timeout => 1200, timeout => 1200,
require => [Exec['composer'], Package['php', 'php-xml']] require => [Exec['composer'], Package['php', 'php-xml']]
......
...@@ -11,6 +11,3 @@ ...@@ -11,6 +11,3 @@
/bin/ /bin/
/composer.phar /composer.phar
/cache
/keys.dev.pub
/keys.tags.pub
Deny from all
\ No newline at end of file
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