diff --git a/manifests/repo/ubuntu.pp b/manifests/repo/ubuntu.pp index 4b7c0a1..9be7ea0 100644 --- a/manifests/repo/ubuntu.pp +++ b/manifests/repo/ubuntu.pp @@ -1,35 +1,28 @@ # Configure ubuntu ppa # # === Parameters # # [*version*] # PHP version to manage (e.g. 5.6) # class php::repo::ubuntu ( - Optional[String[1]] $version = undef, + Pattern[/^\d\.\d/] $version = '5.6', ) { if $facts['os']['name'] != 'Ubuntu' { fail("class php::repo::ubuntu does not work on OS ${facts['os']['name']}") } include 'apt' - if($version == undef) { - $version_real = '5.6' - } else { - $version_real = $version - } - - if ($version_real == '5.5') { + if ($version == '5.5') { fail('PHP 5.5 is no longer available for download') } - assert_type(Pattern[/^\d\.\d/], $version_real) - $version_repo = $version_real ? { + $version_repo = $version ? { '5.4' => 'ondrej/php5-oldstable', default => 'ondrej/php' } ::apt::ppa { "ppa:${version_repo}": package_manage => true, } }