|
21 | 21 | logoutput => true |
22 | 22 | } |
23 | 23 |
|
24 | | - php::ini { "${ini_file}": |
25 | | - target => $ini_file, |
26 | | - sapi_target => 'all', |
27 | | - value => ["extension"], |
28 | | - template => 'extra-ini.erb', |
29 | | - require => [Class['php']] |
| 24 | + file { "${php::config_dir}/${ini_file}": |
| 25 | + ensure => file, |
| 26 | + require => [Class['php']], |
| 27 | + purge => true |
30 | 28 | } |
31 | 29 |
|
32 | 30 | if $version == '2.0.0' or $version == 'dev' { |
|
64 | 62 | } |
65 | 63 |
|
66 | 64 | php::augeas { 'php-load-phalcon-2.0': |
67 | | - entry => 'EXT/extension', |
| 65 | + entry => 'phalconphp/extension', |
68 | 66 | value => 'phalcon.so', |
69 | 67 | target => "${php::config_dir}/${ini_file}", |
70 | 68 | require => [ |
71 | | - Php::Ini["${ini_file}"], |
72 | | - Class['php'], |
| 69 | + File["${php::config_dir}/${ini_file}"], |
73 | 70 | Exec['remove-phalcon-src-2.0']] |
74 | 71 | } |
75 | 72 | } else { |
|
91 | 88 | } |
92 | 89 |
|
93 | 90 | php::augeas { 'php-load-phalcon-1.x': |
94 | | - entry => 'phalcon/extension', |
| 91 | + entry => 'phalconphp/extension', |
95 | 92 | target => "${php::config_dir}/${ini_file}", |
96 | 93 | value => 'phalcon.so', |
97 | 94 | require => [ |
98 | | - Php::Ini["${ini_file}"], |
99 | | - Class['php'], |
| 95 | + File["${php::config_dir}/${ini_file}"], |
100 | 96 | Exec['remove-phalcon-src-1.x']] |
101 | 97 | } |
102 | 98 | } |
|
0 commit comments