Mercurial > repos > other > Puppet

comparison manifests/templates.pp @ 25:13adb555a7e2 puppet-3.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use "<IfVersion>" to handle auth differences between 2.2 and 2.4 Also, add Nano, because damnit vi!
author IBBoard <dev@ibboard.co.uk>
date Mon, 09 Mar 2015 00:58:19 +0000
parents 204330fea19a
children 6bbc86f6cee5
comparison
equal deleted inserted replaced
24:204330fea19a 25:13adb555a7e2
88 source => 'puppet:///common/RPM-GPG-KEY-webtatic-andy' 88 source => 'puppet:///common/RPM-GPG-KEY-webtatic-andy'
89 } 89 }
90 } 90 }
91 91
92 class tools { 92 class tools {
93 $packages = [ 'sqlite', 'bash-completion' ] 93 $packages = [ 'sqlite', 'bash-completion', 'nano' ]
94 package { $packages: 94 package { $packages:
95 ensure => latest; 95 ensure => latest;
96 } 96 }
97 } 97 }
98 98
267 imapserver => $imapserver, 267 imapserver => $imapserver,
268 } 268 }
269 269
270 # Common modules used by multiple sites (mod_auth_basic is safe because we HTTPS all the things) 270 # Common modules used by multiple sites (mod_auth_basic is safe because we HTTPS all the things)
271 apache::mod { 271 apache::mod {
272 'auth_basic':; 'authn_file':; 'authz_user':; 'auth_token':;'deflate':; 272 'auth_basic':; 'authn_file':; 'authz_user':; 'auth_token':;'deflate':; 'version':;
273 }
274 if $operatingsystem == 'CentOS' and versioncmp($operatingsystemrelease, 7) >= 0 {
275 apache::mod {
276 'authn_core':;
277 }
273 } 278 }
274 $apache_packages = [ 'mod_auth_token' ] 279 $apache_packages = [ 'mod_auth_token' ]
275 package { $apache_packages: 280 package { $apache_packages:
276 ensure => present; 281 ensure => present;
277 } 282 }