Skip to content

Commit

Permalink
Merge pull request #2 from notanisp/master
Browse files Browse the repository at this point in the history
Allow service to not be managed, tidy bools
  • Loading branch information
solarkennedy committed Jan 18, 2014
2 parents 04b023c + 446e7bf commit 927d96e
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 6 deletions.
11 changes: 7 additions & 4 deletions manifests/init.pp
Expand Up @@ -11,6 +11,7 @@
$package_ensure = $synapse::params::package_ensure,
$package_provider = $synapse::params::package_provider,
$package_name = $synapse::params::package_name,
$service_manage = $synapse::params::service_manage,
$service_ensure = $synapse::params::service_ensure,
$service_enable = $synapse::params::service_enable,
$config_file = $synapse::params::config_file,
Expand All @@ -24,8 +25,10 @@
) inherits synapse::params {

class { 'synapse::install': } ->
class { 'synapse::config': } ~>
class { 'synapse::system_service': } ->
Class['synapse']

class { 'synapse::config': }
if str2bool($service_manage) {
Class['synapse::config'] ~>
class { 'synapse::system_service': }
}
}

1 change: 1 addition & 0 deletions manifests/params.pp
Expand Up @@ -12,6 +12,7 @@
# Allow logic to change based on requested provider
$package_name = undef
$package_provider = undef
$service_manage = true
$service_ensure = 'running'
$service_enable = true
$config_file = '/etc/synapse/synapse.conf.json'
Expand Down
6 changes: 5 additions & 1 deletion manifests/service.pp
Expand Up @@ -67,7 +67,11 @@
owner => 'root',
mode => '0444',
content => template('synapse/service.json.erb'),
notify => Service['synapse'],
}

if str2bool($synapse::service_manage) {
File[$target] ~> Service['synapse'],
}

}

2 changes: 1 addition & 1 deletion manifests/system_service.pp
Expand Up @@ -16,7 +16,7 @@
} ~>
service { 'synapse':
ensure => $synapse::service_ensure,
enable => $synapse::service_enable,
enable => str2bool($synapse::service_enable),
hasstatus => true,
hasrestart => true,
}
Expand Down

0 comments on commit 927d96e

Please sign in to comment.