Skip to content

Commit 7279cd1

Browse files
committed
Update phalconphp::framework class
1 parent d943071 commit 7279cd1

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

manifests/framework.pp

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,10 @@
2121
logoutput => true
2222
}
2323

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
3028
}
3129

3230
if $version == '2.0.0' or $version == 'dev' {
@@ -64,12 +62,11 @@
6462
}
6563

6664
php::augeas { 'php-load-phalcon-2.0':
67-
entry => 'EXT/extension',
65+
entry => 'phalconphp/extension',
6866
value => 'phalcon.so',
6967
target => "${php::config_dir}/${ini_file}",
7068
require => [
71-
Php::Ini["${ini_file}"],
72-
Class['php'],
69+
File["${php::config_dir}/${ini_file}"],
7370
Exec['remove-phalcon-src-2.0']]
7471
}
7572
} else {
@@ -91,12 +88,11 @@
9188
}
9289

9390
php::augeas { 'php-load-phalcon-1.x':
94-
entry => 'phalcon/extension',
91+
entry => 'phalconphp/extension',
9592
target => "${php::config_dir}/${ini_file}",
9693
value => 'phalcon.so',
9794
require => [
98-
Php::Ini["${ini_file}"],
99-
Class['php'],
95+
File["${php::config_dir}/${ini_file}"],
10096
Exec['remove-phalcon-src-1.x']]
10197
}
10298
}

0 commit comments

Comments
 (0)