summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-06-17 15:56:48 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-06-17 15:56:48 -0300
commit87521903b5d4b9dc96758b4e734ca3db96c9b214 (patch)
treed33f85ce1c0ab09a417f188a26caf2d603192b82 /manifests
parentaf426f2985e75d0dc235bbb05460eed41315cc94 (diff)
downloadpuppet-nginx-87521903b5d4b9dc96758b4e734ca3db96c9b214.tar.gz
puppet-nginx-87521903b5d4b9dc96758b4e734ca3db96c9b214.tar.bz2
Adds use_fqdn param
Diffstat (limited to 'manifests')
-rw-r--r--manifests/site.pp12
-rw-r--r--manifests/site/config.pp1
2 files changed, 7 insertions, 6 deletions
diff --git a/manifests/site.pp b/manifests/site.pp
index 4391485..f73ae30 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -21,12 +21,12 @@ define nginx::site(
}
nginx::site::config { "${name}-ssl":
- name => $name,
- ensure => $ssl,
- source => $source,
- template => "${template}-ssl",
- backend => $backend,
- require => $certbot ? {
+ use_fqdn => $name,
+ ensure => $ssl,
+ source => $source,
+ template => "${template}-ssl",
+ backend => $backend,
+ require => $certbot ? {
true => Certbot::Manage[$name],
default => undef,
}
diff --git a/manifests/site/config.pp b/manifests/site/config.pp
index ed641b1..8bb7304 100644
--- a/manifests/site/config.pp
+++ b/manifests/site/config.pp
@@ -1,4 +1,5 @@
define nginx::site::config(
+ $use_fqdn = $name,
$ensure = present,
$source = 'template',
$template = 'site',