Skip to content

Commit a333b4b

Browse files
authored
Merge pull request #5 from claranet/russ/make_apm_repo_optional
Add support to make the APM yum/apt repo configuration optional
2 parents c7e914e + 7efdd7f commit a333b4b

File tree

1 file changed

+22
-16
lines changed

1 file changed

+22
-16
lines changed

manifests/params.pp

+22-16
Original file line numberDiff line numberDiff line change
@@ -19,28 +19,34 @@
1919
$newrelic_php_package = 'newrelic-php5'
2020
$newrelic_php_service = 'newrelic-daemon'
2121
$newrelic_php_conf_dir = ['/etc/php.d']
22-
package { 'newrelic-repo-5-3.noarch':
23-
ensure => present,
24-
source => 'http://yum.newrelic.com/pub/newrelic/el5/x86_64/newrelic-repo-5-3.noarch.rpm',
25-
provider => rpm,
26-
}
22+
$newrelic_enable_repo = true
23+
if $newrelic_enable_repo {
24+
package { 'newrelic-repo-5-3.noarch':
25+
ensure => present,
26+
source => 'http://yum.newrelic.com/pub/newrelic/el5/x86_64/newrelic-repo-5-3.noarch.rpm',
27+
provider => rpm,
28+
}
29+
}
2730
}
2831
'Debian': {
2932
$newrelic_package_name = 'newrelic-sysmond'
3033
$newrelic_service_name = 'newrelic-sysmond'
3134
$newrelic_php_package = 'newrelic-php5'
3235
$newrelic_php_service = 'newrelic-daemon'
33-
apt::source { 'newrelic':
34-
location => 'http://apt.newrelic.com/debian/',
35-
repos => 'non-free',
36-
key => {
37-
id => 'B60A3EC9BC013B9C23790EC8B31B29E5548C16BF',
38-
key => 'https://download.newrelic.com/548C16BF.gpg',
39-
},
40-
include => {
41-
src => false,
42-
},
43-
release => 'newrelic',
36+
$newrelic_enable_repo = true
37+
if $newrelic_enable_repo {
38+
apt::source { 'newrelic':
39+
location => 'http://apt.newrelic.com/debian/',
40+
repos => 'non-free',
41+
key => {
42+
id => 'B60A3EC9BC013B9C23790EC8B31B29E5548C16BF',
43+
key => 'https://download.newrelic.com/548C16BF.gpg',
44+
},
45+
include => {
46+
src => false,
47+
},
48+
release => 'newrelic',
49+
}
4450
}
4551
case $facts['operatingsystem'] {
4652
'Debian': {

0 commit comments

Comments
 (0)