Skip to content

Commit 1975925

Browse files
committed
Enable logoutput
1 parent 4b3ab7a commit 1975925

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

Modulefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ dependency 'puppetlabs/apt','>=1.0.0'
1414
dependency 'example42/php','>=1.0.0'
1515
dependency 'example42/puppi','>=1.0.0'
1616

17-
version '1.0.48'
17+
version '1.0.49'

manifests/framework.pp

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
require => [
3434
Class['phalconphp::zephir'],
3535
Exec['git-pull-phalcon']],
36-
onlyif => 'test -f ./config.json',
36+
onlyif => 'test -f /tmp/cphalcon/config.json',
3737
logoutput => true,
3838
}
3939

@@ -62,12 +62,13 @@
6262
}
6363

6464
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 => [
6969
File["${php::config_dir}/${ini_file}"],
70-
Exec['remove-phalcon-src-2.0']]
70+
Exec['remove-phalcon-src-2.0']],
71+
logoutput => true
7172
}
7273
} else {
7374
exec { 'install-phalcon-1.x':
@@ -88,12 +89,13 @@
8889
}
8990

9091
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 => [
9596
File["${php::config_dir}/${ini_file}"],
96-
Exec['remove-phalcon-src-1.x']]
97+
Exec['remove-phalcon-src-1.x']],
98+
logoutput => true
9799
}
98100
}
99101
}

0 commit comments

Comments
 (0)