Skip to content

Commit 56d9997

Browse files
committed
Update readme file and add the ability to set debug to true or false
1 parent 9503939 commit 56d9997

File tree

4 files changed

+26
-17
lines changed

4 files changed

+26
-17
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','>=2.0.17'
1515
dependency 'example42/puppi','>=1.0.0'
1616

17-
version '1.0.56'
17+
version '1.0.57'

README.markdown

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@
88

99
class {'phalconphp':
1010
ensure_sys_deps=>true,
11-
ensure=>'2.0.0',
11+
ensure=>'master',
1212
install_devtools=>true,
1313
devtools_version=>'1.3.x',
1414
install_zephir=>true,
1515
compat_sys_deps=>false,
16-
zephir_build
16+
zephir_build=>false,
17+
ini_file=>'phalcon.ini',
18+
debug=>false
1719
}
1820

1921
### Gittip: ###
@@ -30,6 +32,8 @@
3032
install_zephir
3133
compat_sys_deps
3234
zephir_build
35+
ini_file
36+
debug
3337

3438
### Prerequisites: ###
3539

manifests/framework.pp

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,27 @@
33
class phalconphp::framework (
44
$version,
55
$zephir_build = false,
6-
$ini_file = "phalcon.ini") {
6+
$ini_file = "phalcon.ini",
7+
$debug = false) {
78
exec { 'git-clone-phalcon':
89
command => "git clone -b ${version} https://github.com/phalcon/cphalcon.git",
910
cwd => '/tmp',
1011
require => [Class['phalconphp::deps::sys']],
1112
unless => 'test -d /tmp/cphalcon',
12-
logoutput => true
13+
logoutput => $debug
1314
} ->
1415
exec { 'git-pull-phalcon':
1516
command => 'git pull',
1617
cwd => '/tmp/cphalcon',
1718
onlyif => 'test -d /tmp/cphalcon',
1819
require => [Exec['git-clone-phalcon']],
19-
logoutput => true
20+
logoutput => $debug
2021
}
2122

2223
file { "${php::config_dir}/${ini_file}":
23-
ensure => file,
24-
require => [Class['php']],
25-
purge => true
24+
ensure => file,
25+
require => [Class['php']],
26+
logoutput => $debug
2627
}
2728

2829
if $version == '2.0.0' or $version == 'dev' {
@@ -34,30 +35,30 @@
3435
Class['phalconphp::deps::zephir'],
3536
Exec['git-pull-phalcon']],
3637
onlyif => 'test -f /tmp/cphalcon/config.json',
37-
logoutput => true
38+
logoutput => $debug
3839
}
3940

4041
exec { 'install-phalcon-2.0':
4142
command => 'zephir build',
4243
cwd => '/tmp/cphalcon',
4344
require => [Exec['generate-phalcon-2.0']],
44-
logoutput => true
45+
logoutput => $debug
4546
}
4647
} else {
4748
exec { 'install-phalcon-2.0':
4849
command => "/tmp/cphalcon/ext/install-test",
4950
cwd => '/tmp/cphalcon/ext',
5051
require => [Exec['git-pull-phalcon']],
5152
onlyif => 'test -f /tmp/cphalcon/ext/install-test',
52-
logoutput => true
53+
logoutput => $debug
5354
}
5455
}
5556

5657
exec { 'remove-phalcon-src-2.0':
5758
cwd => '/tmp',
5859
command => 'rm ./cphalcon -R -f',
5960
require => [Exec['install-phalcon-2.0']],
60-
logoutput => true
61+
logoutput => $debug
6162
}
6263

6364
php::augeas { 'php-load-phalcon-2.0':
@@ -75,7 +76,7 @@
7576
cwd => '/tmp/cphalcon/build',
7677
onlyif => 'test -f /tmp/cphalcon/build/install',
7778
require => [Exec['git-pull-phalcon']],
78-
logoutput => true,
79+
logoutput => $debug
7980
}
8081

8182
exec { 'remove-phalcon-src-1.x':
@@ -84,7 +85,7 @@
8485
require => [
8586
Exec['git-pull-phalcon'],
8687
Exec['install-phalcon-1.x']],
87-
logoutput => true
88+
logoutput => $debug
8889
}
8990

9091
php::augeas { 'php-load-phalcon-1.x':

manifests/init.pp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@
3535
# [*ini_file*]
3636
# Path to the desired ini_file, through which phalconphp will be loaded
3737
#
38+
# [*debug*]
39+
# Make the commands execution more verbose - Defaults to false
40+
#
3841
# Actions:
3942
#
4043
# Requires: see Modulefile
@@ -44,15 +47,16 @@
4447
#
4548

4649
class phalconphp (
47-
$ensure = '2.0.0',
50+
$ensure = 'master',
4851
$ensure_sys_deps = true,
4952
$install_zephir = true,
5053
$install_devtools = true,
5154
$devtools_version = '1.3.x',
5255
$zephir_build = false,
5356
$compat_sys_deps = false,
5457
$custom_ini = true,
55-
$ini_file = "phalcon.ini") {
58+
$ini_file = "phalcon.ini",
59+
$debug = false) {
5660
# Install the system dependencies
5761
if $ensure_sys_deps == true {
5862
class { 'phalconphp::deps::sys': each_compat => $compat_sys_deps }

0 commit comments

Comments
 (0)