Merge pull request #552 from oxc/freebsd_prefix

Improve package prefix selection on FreeBSD
voxpupuli · Apr 21, 2020 · 80e9279 · 80e9279
2 parents 691df11 + 3e011b9
commit 80e9279
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/manifests/globals.pp b/manifests/globals.pp
@@ -144,6 +144,14 @@
       }
     }
     'FreeBSD': {
+      case $globals_php_version {
+        /^(\d)\.(\d)$/: {
+          $package_prefix = "php${1}${2}-"
+        }
+        default: {
+          $package_prefix = 'php56-'
+        }
+      }
       $default_config_root  = '/usr/local/etc'
       $default_fpm_pid_file = '/var/run/php-fpm.pid'
       $fpm_service_name     = undef

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -179,7 +179,7 @@
       $fpm_group               = 'www'
       $embedded_package_suffix = 'embed'
       $embedded_inifile        = "${config_root}/php-embed.ini"
-      $package_prefix          = 'php56-'
+      $package_prefix          = $php::globals::package_prefix
       $compiler_packages       = ['gcc']
       $manage_repos            = false
       $root_group              = 'wheel'

diff --git a/manifests/pear.pp b/manifests/pear.pp
@@ -33,10 +33,6 @@
           # even though others are called 'php5-fpm' or 'php5-dev'
           $package_name = "php-${php::params::pear_package_suffix}"
         }
-        'FreeBSD': {
-          # On FreeBSD the package name is just 'pear'.
-          $package_name = $php::params::pear_package_suffix
-        }
         default: {
           # This is the default for all other architectures
           $package_name = "${php::package_prefix}${php::params::pear_package_suffix}"