comparison manifests/templates.pp @ 146:816e35f86a5d puppet-3.6

Remove mod_auth_token and replace with mod_xsendfile
author IBBoard <dev@ibboard.co.uk>
date Sat, 25 Mar 2017 20:18:13 +0000
parents 88f38ef7359f
children 6cb6dc1f74d4
comparison
equal deleted inserted replaced
145:88f38ef7359f 146:816e35f86a5d
451 imapserver => $imapserver, 451 imapserver => $imapserver,
452 firewall_cmd => $firewall_cmd, 452 firewall_cmd => $firewall_cmd,
453 } 453 }
454 454
455 # Common modules used by multiple sites (mod_auth_basic is safe because we HTTPS all the things) 455 # Common modules used by multiple sites (mod_auth_basic is safe because we HTTPS all the things)
456 $mods = [ 'auth_basic',
457 'authn_file',
458 'authz_user',
459 'deflate',
460 'xsendfile'
461 ]
456 apache::mod { 462 apache::mod {
457 'auth_basic':; 'authn_file':; 'authz_user':; 'auth_token':;'deflate':; 463 $mods:;
458 } 464 }
459 if $operatingsystem == 'CentOS' and versioncmp($operatingsystemrelease, 7) >= 0 { 465 if $operatingsystem == 'CentOS' and versioncmp($operatingsystemrelease, 7) >= 0 {
460 apache::mod { 466 apache::mod {
461 'authn_core':; 467 'authn_core':;
462 } 468 }
463 } 469 }
464 $apache_packages = [ 'mod_auth_token' ] 470 $apache_packages = [ 'mod_xsendfile' ]
465 package { $apache_packages: 471 package { $apache_packages:
466 ensure => present; 472 ensure => present;
467 } 473 }
468 474
469 #Configure our sites, using templates for the custom fragments where the extra content is too long 475 #Configure our sites, using templates for the custom fragments where the extra content is too long