Skip to content
This repository was archived by the owner on Feb 2, 2022. It is now read-only.

Commit b6e7a8e

Browse files
mzeismzeis
committed
Removed most of the puppet-lint warnings/errors.
1 parent 1b77edc commit b6e7a8e

3 files changed

Lines changed: 58 additions & 58 deletions

File tree

‎manifests/init.pp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
include augeas
88

99
if $stable {
10-
$download_path = 'https://raw.githubusercontent.com/netz98/n98-magerun/master/n98-magerun.phar'
10+
$download_path = 'https://raw.githubusercontent.com/netz98/n98-magerun/master/n98-magerun.phar'
1111
} else {
12-
$download_path = 'https://raw.githubusercontent.com/netz98/n98-magerun/develop/n98-magerun.phar'
12+
$download_path = 'https://raw.githubusercontent.com/netz98/n98-magerun/develop/n98-magerun.phar'
1313
}
14-
14+
1515
exec { 'download n98-magerun':
16-
command => "curl -L -o n98-magerun.phar ${download_path}",
17-
creates => "${install_dir}/n98-magerun.phar",
18-
cwd => $install_dir,
19-
require => [
16+
command => "curl -L -o n98-magerun.phar ${download_path}",
17+
creates => "${install_dir}/n98-magerun.phar",
18+
cwd => $install_dir,
19+
require => [
2020
Package['curl', $php_package],
2121
Augeas['whitelist_phar', 'allow_url_fopen']
2222
]
@@ -32,11 +32,11 @@
3232

3333
if $config_file {
3434
file { '.n98-magerun.yaml':
35-
path => "${install_dir}/.n98-magerun.yaml",
3635
ensure => present,
37-
source => "${config_file}",
38-
owner => root,
39-
group => root
36+
path => "${install_dir}/.n98-magerun.yaml",
37+
source => $config_file,
38+
owner => root,
39+
group => root
4040
}
4141
}
4242

‎manifests/install.pp‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
class n98magerun::install(
2-
$installation_folder = $n98magerun::install::params::installation_folder,
3-
$magento_version = $n98magerun::install::params::magento_version,
4-
$db_host = $n98magerun::install::params::db_host,
5-
$db_user = $n98magerun::install::params::db_user,
6-
$db_pass = $n98magerun::install::params::db_pass,
7-
$db_name = $n98magerun::install::params::db_name,
8-
$install_sample_data = $n98magerun::install::params::install_sample_data,
9-
$use_default_config_params = $n98magerun::install::params::use_default_config_params,
10-
$replace_htaccess_file = $n98magerun::install::params::replace_htaccess_file,
11-
$base_url = $n98magerun::install::params::base_url,
12-
$installation_timeout = $n98magerun::install::params::installation_timeout
13-
) inherits n98magerun::install::params
14-
{
15-
require n98magerun
2+
$installation_folder = $n98magerun::install::params::installation_folder,
3+
$magento_version = $n98magerun::install::params::magento_version,
4+
$db_host = $n98magerun::install::params::db_host,
5+
$db_user = $n98magerun::install::params::db_user,
6+
$db_pass = $n98magerun::install::params::db_pass,
7+
$db_name = $n98magerun::install::params::db_name,
8+
$install_sample_data = $n98magerun::install::params::install_sample_data,
9+
$use_default_config_params = $n98magerun::install::params::use_default_config_params,
10+
$replace_htaccess_file = $n98magerun::install::params::replace_htaccess_file,
11+
$base_url = $n98magerun::install::params::base_url,
12+
$installation_timeout = $n98magerun::install::params::installation_timeout
13+
) {
14+
require n98magerun
15+
include n98magerun::install::params
1616

17-
if $replace_htaccess_file == true {
18-
$real_replace_htaccess_file = 'yes'
19-
} else {
20-
$real_replace_htaccess_file = 'no'
21-
}
22-
if $use_default_config_params == true {
23-
$real_use_default_config_params = 'yes'
24-
} else {
25-
$real_use_default_config_params = 'no'
26-
}
27-
if $install_sample_data == true {
28-
$real_install_sample_data = 'yes'
29-
} else {
30-
$real_install_sample_data = 'no'
31-
}
17+
if $replace_htaccess_file == true {
18+
$real_replace_htaccess_file = 'yes'
19+
} else {
20+
$real_replace_htaccess_file = 'no'
21+
}
22+
if $use_default_config_params == true {
23+
$real_use_default_config_params = 'yes'
24+
} else {
25+
$real_use_default_config_params = 'no'
26+
}
27+
if $install_sample_data == true {
28+
$real_install_sample_data = 'yes'
29+
} else {
30+
$real_install_sample_data = 'no'
31+
}
3232

33-
exec { 'install magento':
34-
command => "/usr/bin/env php /usr/local/bin/n98-magerun.phar install --magentoVersionByName='$magento_version' --installationFolder='$installation_folder' --dbHost='$db_host' --dbUser='$db_user' --dbPass='$db_pass' --dbName='$db_name' --installSampleData='$real_install_sample_data' --useDefaultConfigParams='$real_use_default_config_params' --replaceHtaccessFile='$real_replace_htaccess_files' --baseUrl='$base_url'",
35-
creates => "$installation_folder/app/etc/local.xml",
36-
timeout => $installation_timeout
37-
}
38-
}
33+
exec { 'install magento':
34+
command => "/usr/bin/env php /usr/local/bin/n98-magerun.phar install --magentoVersionByName='${magento_version}' --installationFolder='${installation_folder}' --dbHost='${db_host}' --dbUser='${db_user}' --dbPass='${db_pass}' --dbName='${db_name}' --installSampleData='${real_install_sample_data}' --useDefaultConfigParams='${real_use_default_config_params}' --replaceHtaccessFile='${real_replace_htaccess_files}' --baseUrl='${base_url}'",
35+
creates => "${installation_folder}/app/etc/local.xml",
36+
timeout => $installation_timeout
37+
}
38+
}

‎manifests/install/params.pp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
class n98magerun::install::params {
2-
$installation_folder = ""
3-
$magento_version = "magento-ce-1.7.0.2"
4-
$db_host = "localhost"
5-
$db_user = "root"
6-
$db_pass = ""
7-
$db_name = "magento"
8-
$install_sample_data = false
9-
$use_default_config_params = true
10-
$replace_htaccess_file = false
11-
$base_url = 'http://magento.local'
12-
$installation_timeout = 1800
13-
}
2+
$installation_folder = ''
3+
$magento_version = 'magento-ce-1.7.0.2'
4+
$db_host = 'localhost'
5+
$db_user = 'root'
6+
$db_pass = ''
7+
$db_name = 'magento'
8+
$install_sample_data = false
9+
$use_default_config_params = true
10+
$replace_htaccess_file = false
11+
$base_url = 'http://magento.local'
12+
$installation_timeout = 1800
13+
}

0 commit comments

Comments
 (0)