Mercurial > repos > other > Puppet

comparison manifests/templates.pp @ 393:a948419a23b1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix MySQL package names on Ubuntu CentOS packages separate `mysqlnd` packages but Ubuntu doesn't
author IBBoard <dev@ibboard.co.uk>
date Sat, 09 Apr 2022 18:49:43 +0100
parents df5ad1612af7
children e93588ec1ce3
comparison
equal deleted inserted replaced
392:a7eaf17bff26 393:a948419a23b1
503 } 503 }
504 else { 504 else {
505 $mysqlpackage = 'mysql' 505 $mysqlpackage = 'mysql'
506 $mysqlsuffix = '55w' 506 $mysqlsuffix = '55w'
507 } 507 }
508 $phpmysqlsuffix = 'nd'
508 } 509 }
509 elsif $operatingsystem == 'Ubuntu' { 510 elsif $operatingsystem == 'Ubuntu' {
510 $mysqlpackage = 'mariadb' 511 $mysqlpackage = 'mariadb'
511 $mysqlsuffix = '' 512 $mysqlsuffix = ''
513 $phpmysqlsuffix = ''
512 } 514 }
513 else { 515 else {
514 fail("No MySQL support for ${operatingsystem}") 516 fail("No MySQL support for ${operatingsystem}")
515 } 517 }
516 class { 'website::mysql': 518 class { 'website::mysql':
517 mysqluser => template('defaultusers/mysql-user'), 519 mysqluser => template('defaultusers/mysql-user'),
518 mysqlpassword => template('defaultusers/mysql-password'), 520 mysqlpassword => template('defaultusers/mysql-password'),
519 mysqlprefix => $mysqlpackage, 521 mysqlprefix => $mysqlpackage,
520 mysqlsuffix => $mysqlsuffix, 522 mysqlsuffix => $mysqlsuffix,
521 phpsuffix => $php_suffix, 523 phpsuffix => $php_suffix,
522 phpmysqlsuffix => 'nd' 524 phpmysqlsuffix => $phpmysqlsuffix
523 } 525 }
524 526
525 # Additional supporting directories that aren't served as sites 527 # Additional supporting directories that aren't served as sites
526 file { [ '/srv/sites/errorhandling', '/srv/sites/private', '/srv/cms' ]: 528 file { [ '/srv/sites/errorhandling', '/srv/sites/private', '/srv/cms' ]:
527 ensure => directory, 529 ensure => directory,