Skip to content

Commit 2514020

Browse files
committed
Merge pull request #16 from gblair/preserve-pool-configs
Installing new PHP project destroys pool config for other PHP projects
2 parents 96ab377 + f674f62 commit 2514020

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

files/empty-conf-dir/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
This directory is managed by the Boxen PHP module. Other files within this folder with be purged when boxen runs to ensure that the configs are clean and no files remain lying around - you have been warned!
1+
This directory is managed by the Boxen PHP module. Other files within this folder may be purged when boxen runs to ensure that the configs are clean and no files remain lying around - you have been warned!
22

33
http://christian.hofstaedtler.name/blog/2008/11/puppet-managing-directories-recursively.html

manifests/fpm.pp

-2
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,9 @@
4040
}
4141

4242
# Set up FPM Pool config directory
43-
# Purge non managed files within this, to ensure we have no conflicts
4443
file { $fpm_pool_config_dir:
4544
ensure => directory,
4645
recurse => true,
47-
purge => true,
4846
force => true,
4947
source => 'puppet:///modules/php/empty-conf-dir',
5048
require => File[$version_config_root],

0 commit comments

Comments
 (0)