Skip to content

Commit d8ab2cd

Browse files
committed
Allow $service_* to be auto-set based on $service_provider
This is so one doesn't have to manually configure all $service_ variables but still can if they desire.
1 parent 286ff80 commit d8ab2cd

2 files changed

Lines changed: 35 additions & 11 deletions

File tree

manifests/init.pp

Lines changed: 35 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@
8080
$package_ensure = $uwsgi::params::package_ensure,
8181
$package_provider = $uwsgi::params::package_provider,
8282
$service_name = $uwsgi::params::service_name,
83-
$service_file = $uwsgi::params::service_file,
84-
$service_file_mode = $uwsgi::params::service_file_mode,
85-
$service_template = $uwsgi::params::service_template,
83+
$service_file = undef,
84+
$service_file_mode = undef,
85+
$service_template = undef,
8686
$service_ensure = $uwsgi::params::service_ensure,
8787
$service_enable = $uwsgi::params::service_enable,
8888
$service_provider = $uwsgi::params::service_provider,
@@ -131,13 +131,40 @@
131131
require => Package[$package_name]
132132
}
133133

134-
file { $service_file:
134+
if $service_file == undef {
135+
$service_file_real = $service_provider ? {
136+
redhat => '/etc/init.d/uwsgi',
137+
upstart => '/etc/init/uwsgi.conf',
138+
}
139+
} else {
140+
$service_file_real = $service_file
141+
}
142+
143+
if $service_file_mode == undef {
144+
$service_file_mode_real = $service_provider ? {
145+
redhat => '0555',
146+
upstart => '0644',
147+
}
148+
} else {
149+
$service_file_mode_real = $service_file_mode
150+
}
151+
152+
if $service_template == undef {
153+
$service_template_real = $service_provider ? {
154+
redhat => 'uwsgi/uwsgi_service-redhat.erb',
155+
upstart => 'uwsgi/uwsgi_upstart.conf.erb',
156+
}
157+
} else {
158+
$service_template_real = $service_template
159+
}
160+
161+
file { $service_file_real:
135162
ensure => $file_ensure,
136163
owner => 'root',
137164
group => 'root',
138-
mode => $service_file_mode,
165+
mode => $service_file_mode_real,
139166
replace => $manage_service_file,
140-
content => template($service_template),
167+
content => template($service_template_real),
141168
require => Package[$package_name]
142169
}
143170

@@ -158,11 +185,11 @@
158185
require => [
159186
Package[$package_name],
160187
File[$config_file],
161-
File[$service_file]
188+
File[$service_file_real]
162189
],
163190
subscribe => [
164191
File[$config_file],
165-
File[$service_file]
192+
File[$service_file_real]
166193
]
167194
}
168195

manifests/params.pp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010
$package_ensure = 'installed'
1111
$package_provider = 'pip'
1212
$service_name = 'uwsgi'
13-
$service_file = '/etc/init/uwsgi.conf'
14-
$service_file_mode = '0644'
15-
$service_template = 'uwsgi/uwsgi_upstart.conf.erb'
1613
$service_ensure = true
1714
$service_enable = true
1815
$service_provider = 'upstart'

0 commit comments

Comments
 (0)