Skip to content

Commit 3e011b9

Browse files
committed
Auto-determine FreeBSD package prefix from version
If the php version has been set in globals, use it to determine the default package prefix on FreeBSD. This should be a compatible change, since the package prefix can still be overridden, and has to match the selected version anyway.
1 parent 369cc38 commit 3e011b9

2 files changed

Lines changed: 9 additions & 1 deletion

File tree

manifests/globals.pp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,14 @@
144144
}
145145
}
146146
'FreeBSD': {
147+
case $globals_php_version {
148+
/^(\d)\.(\d)$/: {
149+
$package_prefix = "php${1}${2}-"
150+
}
151+
default: {
152+
$package_prefix = 'php56-'
153+
}
154+
}
147155
$default_config_root = '/usr/local/etc'
148156
$default_fpm_pid_file = '/var/run/php-fpm.pid'
149157
$fpm_service_name = undef

manifests/params.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@
179179
$fpm_group = 'www'
180180
$embedded_package_suffix = 'embed'
181181
$embedded_inifile = "${config_root}/php-embed.ini"
182-
$package_prefix = 'php56-'
182+
$package_prefix = $php::globals::package_prefix
183183
$compiler_packages = ['gcc']
184184
$manage_repos = false
185185
$root_group = 'wheel'

0 commit comments

Comments
 (0)