diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2011-03-02 19:54:46 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2011-03-02 19:54:46 +0000 |
| commit | d6bd706eaeaca53b9e8ca6389a51d6f41e87198c (patch) | |
| tree | 350a2e985683f335e68a9bf441da77950131930d | |
| parent | 49730b620010a4683139911cf35b005f473758ca (diff) | |
| download | puppet-d6bd706eaeaca53b9e8ca6389a51d6f41e87198c.tar puppet-d6bd706eaeaca53b9e8ca6389a51d6f41e87198c.tar.gz puppet-d6bd706eaeaca53b9e8ca6389a51d6f41e87198c.tar.bz2 puppet-d6bd706eaeaca53b9e8ca6389a51d6f41e87198c.tar.xz puppet-d6bd706eaeaca53b9e8ca6389a51d6f41e87198c.zip | |
use vhost_base instead of vhost_other_app
| -rw-r--r-- | modules/sympa/manifests/init.pp | 10 | ||||
| -rw-r--r-- | modules/sympa/templates/vhost_ml.conf | 7 |
2 files changed, 3 insertions, 14 deletions
diff --git a/modules/sympa/manifests/init.pp b/modules/sympa/manifests/init.pp index c8792037..4ea4f37d 100644 --- a/modules/sympa/manifests/init.pp +++ b/modules/sympa/manifests/init.pp @@ -56,15 +56,11 @@ class sympa { apache::vhost_redirect_ssl { "$vhost": } - apache::vhost_other_app { "$vhost": - vhost_file => "sympa/vhost_ml.conf", + apache::vhost_base { "$vhost": + use_ssl => true, + content => template("sympa/vhost_ml.conf"), } - openssl::self_signed_cert{ "$vhost": - 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 acdbc8e8..f8441677 100644 --- a/modules/sympa/templates/vhost_ml.conf +++ b/modules/sympa/templates/vhost_ml.conf @@ -1,8 +1,3 @@ -<VirtualHost *:443> - ServerName ml.<%= domain %> - SSLEngine on - SSLCertificateFile /etc/ssl/apache/ml.<%= domain %>.pem - SSLCertificateKeyFile /etc/ssl/apache/ml.<%= domain %>.pem DocumentRoot <%= lib_dir + "/sympa/cgi" %> <Location /> @@ -16,5 +11,3 @@ Allow from all </Directory> - -</VirtualHost> |