summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--manifests/init.pp18
1 files changed, 9 insertions, 9 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 87a0ea1..3c6fc9b 100644
--- 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"] ],
}
}
}