diff options
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/modules/site_nagios/manifests/server.pp | 4 | ||||
| -rw-r--r-- | puppet/modules/site_postfix/manifests/debug.pp | 9 | ||||
| -rw-r--r-- | puppet/modules/site_postfix/manifests/mx.pp | 5 | ||||
| -rw-r--r-- | puppet/modules/site_postfix/manifests/mx/tls.pp | 2 | ||||
| -rw-r--r-- | puppet/modules/site_webapp/manifests/init.pp | 21 | ||||
| m--------- | puppet/modules/stdlib | 0 |
6 files changed, 29 insertions, 12 deletions
diff --git a/puppet/modules/site_nagios/manifests/server.pp b/puppet/modules/site_nagios/manifests/server.pp index c114a39a..5ca04da2 100644 --- a/puppet/modules/site_nagios/manifests/server.pp +++ b/puppet/modules/site_nagios/manifests/server.pp @@ -18,6 +18,10 @@ class site_nagios::server inherits nagios::base { #before => Class ['nagios::defaults'] } + apache::module { + 'headers': ensure => present; + } + File ['nagios_htpasswd'] { source => undef, content => "nagiosadmin:$nagiosadmin_pw", diff --git a/puppet/modules/site_postfix/manifests/debug.pp b/puppet/modules/site_postfix/manifests/debug.pp new file mode 100644 index 00000000..f370d166 --- /dev/null +++ b/puppet/modules/site_postfix/manifests/debug.pp @@ -0,0 +1,9 @@ +class site_postfix::debug { + + postfix::config { + 'debug_peer_list': value => '127.0.0.1'; + 'debug_peer_level': value => '1'; + 'smtpd_tls_loglevel': value => '1'; + } + +} diff --git a/puppet/modules/site_postfix/manifests/mx.pp b/puppet/modules/site_postfix/manifests/mx.pp index 0581f147..7e2082d9 100644 --- a/puppet/modules/site_postfix/manifests/mx.pp +++ b/puppet/modules/site_postfix/manifests/mx.pp @@ -17,13 +17,14 @@ class site_postfix::mx { 'home_mailbox': value => 'Maildir/'; 'virtual_alias_maps': value => 'tcp:localhost:4242'; 'luser_relay': value => 'vmail'; - 'local_recipient_maps': value => ''; - 'debug_peer_list': value => '127.0.0.1'; } include site_postfix::mx::smtpd_checks include site_postfix::mx::tls + # greater verbosity for debugging, take out for production + include site_postfix::debug + user { 'vmail': ensure => present, comment => 'Leap Mailspool', diff --git a/puppet/modules/site_postfix/manifests/mx/tls.pp b/puppet/modules/site_postfix/manifests/mx/tls.pp index 4b7a2626..8c9da9db 100644 --- a/puppet/modules/site_postfix/manifests/mx/tls.pp +++ b/puppet/modules/site_postfix/manifests/mx/tls.pp @@ -23,7 +23,7 @@ class site_postfix::mx::tls { 'smtpd_tls_CAfile': value => $client_ca; 'smtpd_tls_cert_file': value => $cert_path; 'smtpd_tls_key_file': value => $key_path; - 'smtpd_tls_req_ccert': value => 'yes'; + 'smtpd_tls_ask_ccert': value => 'yes'; 'smtpd_tls_security_level': value => 'may'; } diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp index 1db52477..84ec8fab 100644 --- a/puppet/modules/site_webapp/manifests/init.pp +++ b/puppet/modules/site_webapp/manifests/init.pp @@ -54,12 +54,12 @@ class site_webapp { } exec { 'compile_assets': - cwd => '/srv/leap/webapp', - command => '/usr/bin/bundle exec rake assets:precompile', - user => 'leap-webapp', + cwd => '/srv/leap/webapp', + command => '/usr/bin/bundle exec rake assets:precompile', + user => 'leap-webapp', logoutput => on_failure, - require => Exec['bundler_update'], - notify => Service['apache']; + require => Exec['bundler_update'], + notify => Service['apache']; } file { @@ -74,14 +74,14 @@ class site_webapp { target => '/usr/local/share/ca-certificates/leap_api.crt'; "/srv/leap/webapp/public/${api_version}": - ensure => directory, + ensure => directory, require => Vcsrepo['/srv/leap/webapp'], - owner => leap-webapp, group => leap-webapp, mode => '0755'; + owner => leap-webapp, group => leap-webapp, mode => '0755'; "/srv/leap/webapp/public/${api_version}/config/": - ensure => directory, + ensure => directory, require => Vcsrepo['/srv/leap/webapp'], - owner => leap-webapp, group => leap-webapp, mode => '0755'; + owner => leap-webapp, group => leap-webapp, mode => '0755'; "/srv/leap/webapp/public/${api_version}/config/eip-service.json": content => $eip_service, @@ -141,14 +141,17 @@ class site_webapp { git::changes { 'app/assets/stylesheets/head.scss': cwd => '/srv/leap/webapp', + require => Vcsrepo['/srv/leap/webapp'], user => 'leap-webapp'; 'app/assets/stylesheets/tail.scss': cwd => '/srv/leap/webapp', + require => Vcsrepo['/srv/leap/webapp'], user => 'leap-webapp'; 'public/favicon.ico': cwd => '/srv/leap/webapp', + require => Vcsrepo['/srv/leap/webapp'], user => 'leap-webapp'; } diff --git a/puppet/modules/stdlib b/puppet/modules/stdlib -Subproject 85470dfc1e703611a84abf922634d129dd2f8f8 +Subproject 73b69e8198f702f086ff6afd94a54dddc793589 |