Mercurial > repos > other > Puppet

comparison manifests/templates.pp @ 320:99e3ca448d55

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix Remi PHP on CentOS 8 It uses the new "modules" approach, so we need to use a new package provider They also use different signing keys
author IBBoard <dev@ibboard.co.uk>
date Sun, 01 Mar 2020 10:58:00 +0000
parents 2a20a5b7f65a
children 06a401d3ef45
comparison
equal deleted inserted replaced
319:6d719622c72f 320:99e3ca448d55
380 failovermethod => 'priority', 380 failovermethod => 'priority',
381 gpgcheck => 1, 381 gpgcheck => 1,
382 gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi', 382 gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi',
383 } 383 }
384 yumrepo { 'remirepo-php': 384 yumrepo { 'remirepo-php':
385 mirrorlist => 'http://cdn.remirepo.net/enterprise/$releasever/php73/$basearch/mirror', 385 mirrorlist => 'http://cdn.remirepo.net/enterprise/8/modular/$basearch/mirror',
386 descr => "PHP7.3 for CentOS from Remi", 386 descr => 'Remi\'s Modular repository for Enterprise Linux 8 - $basearch',
387 enabled => 1, 387 enabled => 1,
388 failovermethod => 'priority', 388 failovermethod => 'priority',
389 gpgcheck => 1, 389 gpgcheck => 1,
390 gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi', 390 gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi',
391 }
392 file { '/etc/pki/rpm-gpg/RPM-GPG-KEY-remi':
393 ensure => present,
394 source => 'puppet:///common/RPM-GPG-KEY-remi.el8',
395 tag => 'repo-config',
391 } 396 }
392 } else { 397 } else {
393 yumrepo { 'remirepo-safe': 398 yumrepo { 'remirepo-safe':
394 mirrorlist => 'http://cdn.remirepo.net/enterprise/$releasever/safe/mirror', 399 mirrorlist => 'http://cdn.remirepo.net/enterprise/$releasever/safe/mirror',
395 descr => "Extra CentOS packages from Remi", 400 descr => "Extra CentOS packages from Remi",
404 enabled => 1, 409 enabled => 1,
405 failovermethod => 'priority', 410 failovermethod => 'priority',
406 gpgcheck => 1, 411 gpgcheck => 1,
407 gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi', 412 gpgkey => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi',
408 } 413 }
409 } 414 file { '/etc/pki/rpm-gpg/RPM-GPG-KEY-remi':
410 file { '/etc/pki/rpm-gpg/RPM-GPG-KEY-remi': 415 ensure => present,
411 ensure => present, 416 source => 'puppet:///common/RPM-GPG-KEY-remi',
412 source => 'puppet:///common/RPM-GPG-KEY-remi', 417 tag => 'repo-config',
413 before => YumRepo['remirepo-php'], 418 }
414 } 419 }
415 420
416 #Configure the PHP version to use 421 #Configure the PHP version to use
417 class { 'website::php': 422 class { 'website::php':
418 suffix => $php_suffix, 423 suffix => $php_suffix,
419 opcache => 'opcache', 424 opcache => 'opcache',
425 module => ($operatingsystem == 'CentOS' and versioncmp($operatingsystemrelease, '8') >= 0) ? { true => 'remi-7.3', default => undef },
420 extras => [ 'process', 'intl', 'pecl-imagick', 'bcmath', 'pecl-zip' ], 426 extras => [ 'process', 'intl', 'pecl-imagick', 'bcmath', 'pecl-zip' ],
421 } 427 }
422 428
423 #Setup MySQL, using (private) templates to make sure that we set non-std passwords and a default user 429 #Setup MySQL, using (private) templates to make sure that we set non-std passwords and a default user
424 430