|
33 | 33 | require => [ |
34 | 34 | Class['phalconphp::zephir'], |
35 | 35 | Exec['git-pull-phalcon']], |
36 | | - onlyif => 'test -f ./config.json', |
| 36 | + onlyif => 'test -f /tmp/cphalcon/config.json', |
37 | 37 | logoutput => true, |
38 | 38 | } |
39 | 39 |
|
|
62 | 62 | } |
63 | 63 |
|
64 | 64 | php::augeas { 'php-load-phalcon-2.0': |
65 | | - entry => 'phalconphp/extension', |
66 | | - value => 'phalcon.so', |
67 | | - target => "${php::config_dir}/${ini_file}", |
68 | | - require => [ |
| 65 | + entry => 'phalconphp/extension', |
| 66 | + value => 'phalcon.so', |
| 67 | + target => "${php::config_dir}/${ini_file}", |
| 68 | + require => [ |
69 | 69 | File["${php::config_dir}/${ini_file}"], |
70 | | - Exec['remove-phalcon-src-2.0']] |
| 70 | + Exec['remove-phalcon-src-2.0']], |
| 71 | + logoutput => true |
71 | 72 | } |
72 | 73 | } else { |
73 | 74 | exec { 'install-phalcon-1.x': |
|
88 | 89 | } |
89 | 90 |
|
90 | 91 | php::augeas { 'php-load-phalcon-1.x': |
91 | | - entry => 'phalconphp/extension', |
92 | | - target => "${php::config_dir}/${ini_file}", |
93 | | - value => 'phalcon.so', |
94 | | - require => [ |
| 92 | + entry => 'phalconphp/extension', |
| 93 | + target => "${php::config_dir}/${ini_file}", |
| 94 | + value => 'phalcon.so', |
| 95 | + require => [ |
95 | 96 | File["${php::config_dir}/${ini_file}"], |
96 | | - Exec['remove-phalcon-src-1.x']] |
| 97 | + Exec['remove-phalcon-src-1.x']], |
| 98 | + logoutput => true |
97 | 99 | } |
98 | 100 | } |
99 | 101 | } |
0 commit comments