From 50dd2691d5b5adf67dc595e0ef823b7ecb217185 Mon Sep 17 00:00:00 2001
From: rene <rene@endor.universe.local>
Date: Fri, 18 Mar 2022 18:53:30 +0100
Subject: [PATCH] correct use of default with variable

---
 roles/mastodon/tasks/system_setup/letsencrypt.yml | 4 ++--
 roles/mastodon/tasks/system_setup/nginx.yml       | 2 +-
 roles/mastodon/templates/mastodon.conf.j2         | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/roles/mastodon/tasks/system_setup/letsencrypt.yml b/roles/mastodon/tasks/system_setup/letsencrypt.yml
index 67b6ae8..a95574e 100644
--- a/roles/mastodon/tasks/system_setup/letsencrypt.yml
+++ b/roles/mastodon/tasks/system_setup/letsencrypt.yml
@@ -1,5 +1,5 @@
 ---
-- stat: path=/etc/letsencrypt/live/{{ mastodon_host | default('{{ ansible_fqdn }}') }}/fullchain.pem
+- stat: path=/etc/letsencrypt/live/{{ mastodon_host | default(ansible_fqdn) }}/fullchain.pem
   register: letsencrypt_cert
 
 - name: Copy letsencrypt nginx config
@@ -17,7 +17,7 @@
   command: "systemctl reload nginx"
 
 - name: Install letsencrypt cert
-  command: letsencrypt certonly -n --webroot -d {{ mastodon_host | default('{{ ansible_fqdn }}') }} -w {{ mastodon_home }}/{{ mastodon_path }}/public/ --email "webmaster@{{ mastodon_host | default('{{ ansible_fqdn }}') }}" --agree-tos && systemctl reload nginx
+  command: letsencrypt certonly -n --webroot -d {{ mastodon_host | default(ansible_fqdn) }} -w {{ mastodon_home }}/{{ mastodon_path }}/public/ --email "webmaster@{{ mastodon_host | default(ansible_fqdn) }}" --agree-tos && systemctl reload nginx
   when: not letsencrypt_cert.stat.exists
 
 - name: Letsencrypt Job
diff --git a/roles/mastodon/tasks/system_setup/nginx.yml b/roles/mastodon/tasks/system_setup/nginx.yml
index aa78741..f3d2a18 100644
--- a/roles/mastodon/tasks/system_setup/nginx.yml
+++ b/roles/mastodon/tasks/system_setup/nginx.yml
@@ -1,6 +1,6 @@
 ---
 - debug:
-    msg: "Hostname: {{ mastodon_host | default({{ ansible_fqdn }}) }}"
+    msg: "Hostname: {{ mastodon_host | default(ansible_fqdn) }}"
 
 - name: mastodon | Copy nginx config
   template: 
diff --git a/roles/mastodon/templates/mastodon.conf.j2 b/roles/mastodon/templates/mastodon.conf.j2
index f813d81..a9c0bfd 100644
--- a/roles/mastodon/templates/mastodon.conf.j2
+++ b/roles/mastodon/templates/mastodon.conf.j2
@@ -6,7 +6,7 @@ map $http_upgrade $connection_upgrade {
 server {
   listen 80;
   listen [::]:80;
-  server_name {{ mastodon_host | default('{{ ansible_fqdn }}') }};
+  server_name {{ mastodon_host | default(ansible_fqdn') }};
 
   # Useful for Let's Encrypt
   location /.well-known/acme-challenge/ { allow all; }
@@ -24,8 +24,8 @@ server {
   ssl_session_cache shared:SSL:10m;
 
 {% if disable_letsencrypt != "true" %}
-  ssl_certificate     /etc/letsencrypt/live/{{ mastodon_host | default('{{ ansible_fqdn }}') }}/fullchain.pem;
-  ssl_certificate_key /etc/letsencrypt/live/{{ mastodon_host | default('{{ ansible_fqdn }}') }}/privkey.pem;
+  ssl_certificate     /etc/letsencrypt/live/{{ mastodon_host | default(ansible_fqdn) }}/fullchain.pem;
+  ssl_certificate_key /etc/letsencrypt/live/{{ mastodon_host | default(ansible_fqdn) }}/privkey.pem;
 {% endif %}
 
   keepalive_timeout    70;