diff options
| author | Michael Scherer <misc@mageia.org> | 2010-12-09 12:34:27 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2010-12-09 12:34:27 +0000 |
| commit | 6c02c60b99a38c261fd8794c11f0382396e9ad6d (patch) | |
| tree | 2bde7503efafa8d005979e6f39b6c616ac44f242 | |
| parent | 5e5926cb14b0ce1b588c4cc50beee839d92fa72f (diff) | |
| download | puppet-6c02c60b99a38c261fd8794c11f0382396e9ad6d.tar puppet-6c02c60b99a38c261fd8794c11f0382396e9ad6d.tar.gz puppet-6c02c60b99a38c261fd8794c11f0382396e9ad6d.tar.bz2 puppet-6c02c60b99a38c261fd8794c11f0382396e9ad6d.tar.xz puppet-6c02c60b99a38c261fd8794c11f0382396e9ad6d.zip | |
use ssl for mailling list interface, as password are involved ( a more selective approach should be used later )
| -rw-r--r-- | modules/sympa/manifests/init.pp | 11 | ||||
| -rw-r--r-- | modules/sympa/templates/vhost_ml.conf | 5 |
2 files changed, 13 insertions, 3 deletions
diff --git a/modules/sympa/manifests/init.pp b/modules/sympa/manifests/init.pp index 8ad97342..3e8dbe8f 100644 --- a/modules/sympa/manifests/init.pp +++ b/modules/sympa/manifests/init.pp @@ -46,13 +46,20 @@ class sympa { include apache::mod_fcgid apache::webapp_other{"sympa": - webapp_file => "sympa/webapp_sympa.conf", + webapp_file => "sympa/webapp_sympa.conf", } - + + apache::vhost_redirect_ssl { "ml.$domain": } + apache::vhost_other_app { "ml.$domain": vhost_file => "sympa/vhost_ml.conf", } + + openssl::self_signed_cert{ "ml.$domain": + directory => "/etc/ssl/apache/" + } + @@postgresql::database { 'sympa': description => "Sympa database", user => "sympa", diff --git a/modules/sympa/templates/vhost_ml.conf b/modules/sympa/templates/vhost_ml.conf index 1f3b17f7..d8208625 100644 --- a/modules/sympa/templates/vhost_ml.conf +++ b/modules/sympa/templates/vhost_ml.conf @@ -1,5 +1,8 @@ -<VirtualHost *:80> +<VirtualHost *:443> ServerName ml.<%= domain %> + SSLEngine on + SSLCertificateFile /etc/ssl/apache/ml.<%= domain %>.pem + SSLCertificateKeyFile /etc/ssl/apache/ml.<%= domain %>.pem <%- path_cgi_directory = lib_dir + "/sympa/cgi" -%> |