Use ::domain as ssl::cert name

diff --git a/manifests/init.pp b/manifests/init.pp
index 87a0ea1578a28bcb1cb57651de376285a785be07..3c6fc9b6f8cb297e54f5dd745d08dfdba5a1c64c 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,18 +1,18 @@
 # This module is distributed under the GNU Affero General Public License:
-# 
+#
 # Nginx module for puppet
 # Copyright (C) 2010 Sarava Group
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
 # published by the Free Software Foundation, either version 3 of the
 # License, or any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Affero General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -21,11 +21,11 @@ class nginx inherits nginx::base {
     true: {
       include ssl
 
-      ssl::cert { "cert":
+      ssl::cert { "$::domain":
         notify => Service['nginx'],
       }
 
-      ssl::check { "$domain":
+      ssl::check { "$::domain":
         file => true,
       }
 
@@ -36,9 +36,9 @@ class nginx inherits nginx::base {
 
       Service["nginx"] {
         require    => [ Package["nginx"],
-                        File["/etc/nginx/sites-enabled/$domain"],
-                        File["/etc/ssl/private/cert.pem"],
-                        File["/etc/ssl/certs/cert.crt"] ],
+                        File["/etc/nginx/sites-enabled/${::domain}"],
+                        File["/etc/ssl/private/${::domain}.pem"],
+                        File["/etc/ssl/certs/${::domain}.crt"] ],
       }
     }
   }