Adds use_fqdn param

diff --git a/manifests/site.pp b/manifests/site.pp
index 4391485a96599b3c4bfadbc0dea9e2a6fbd573c9..f73ae30cd0450840ae828b0ffb9721c407ec20ef 100644 (file)
--- 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 ed641b1d6b030c792a77b4716da46d330e27268e..8bb73043fd275722436b8864a3d3e0af463c97c2 100644 (file)
--- 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',

diff --git a/templates/site-ssl.erb b/templates/site-ssl.erb
index 871aeb487a33985ab5379220f3a09718d56e6635..ee9c5c8f33f3250b3499f3595782af2d58777164 100644 (file)
--- a/templates/site-ssl.erb
+++ b/templates/site-ssl.erb
@@ -1,10 +1,10 @@
 server {
   listen      443 ssl http2;
-  server_name *.<%= @name %> <%= @name %>;
+  server_name *.<%= @use_fqdn %> <%= @use_fqdn %>;
 
   ssl on;
-  ssl_certificate     /etc/letsencrypt/live/<%= @name %>/fullchain.pem;
-  ssl_certificate_key /etc/letsencrypt/live/<%= @name %>/privkey.pem;
+  ssl_certificate     /etc/letsencrypt/live/<%= @use_fqdn %>/fullchain.pem;
+  ssl_certificate_key /etc/letsencrypt/live/<%= @use_fqdn %>/privkey.pem;
 
   ssl_session_timeout 5m;
 

diff --git a/templates/site.erb b/templates/site.erb
index 93b66b82df7e25aa97ffbe975067df38b4439ae5..9c575cb91a00d9cd25728b790640295aa6172db1 100644 (file)
--- a/templates/site.erb
+++ b/templates/site.erb
@@ -1,9 +1,9 @@
 server {
   listen       80;
-  server_name  *.<%= @name %> <%= @name %>;
+  server_name  *.<%= @use_fqdn %> <%= @use_fqdn %>;
 
   location /.well-known/acme-challenge {
-    root /var/spool/certbot/<%= @name %>;
+    root /var/spool/certbot/<%= @use_fqdn %>;
   }
 
   location / {