rene/ansible-pull
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

switched to new facts-syntax

Browse Source
This commit is contained in:
Rene Mewissen
2026-01-12 12:31:24 +01:00
parent 037b998219
commit 9fd07d57a4
41 changed files with 111 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/mastodon/tasks/main.yml
View File

@@ -1,8 +1,8 @@
---
# Load distro specific variables
- include_vars: "{{ ansible_distribution | lower }}.yml"
- include_vars: "{{ ansible_facts['distribution'] | lower }}.yml"
tags: always
- include_vars: "{{ ansible_fqdn | lower }}.yml"
- include_vars: "{{ ansible_facts['fqdn'] | lower }}.yml"
ignore_errors: True

4
roles/mastodon/tasks/system_setup/letsencrypt.yml
View File

@@ -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_facts['fqdn']) }}/fullchain.pem
register: letsencrypt_cert
- name: Copy letsencrypt nginx config
@@ -19,7 +19,7 @@
- migration is not defined or migration == False
- name: Install letsencrypt cert
command: certbot 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: certbot certonly -n --webroot -d {{ mastodon_host | default(ansible_facts['fqdn']) }} -w {{ mastodon_home }}/{{ mastodon_path }}/public/ --email "webmaster@{{ mastodon_host | default(ansible_facts['fqdn']) }}" --agree-tos && systemctl reload nginx
when:
- not letsencrypt_cert.stat.exists
- migration == False or migration is not defined

2
roles/mastodon/tasks/system_setup/nginx.yml
View File

@@ -1,6 +1,6 @@
---
- debug:
msg: "Hostname: {{ mastodon_host | default(ansible_fqdn) }}"
msg: "Hostname: {{ mastodon_host | default(ansible_facts['fqdn']) }}"
- name: mastodon | Copy nginx config
template:

8
roles/mastodon/templates/mastodon.conf.j2
View File

@@ -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_facts['fqdn']) }};
# Useful for Let's Encrypt
location /.well-known/acme-challenge/ { allow all; }
@@ -16,7 +16,7 @@ server {
server {
listen 443 ssl http2;
listen [::]:443 ssl http2;
server_name {{ mastodon_host | default(ansible_fqdn) }};
server_name {{ mastodon_host | default(ansible_facts['fqdn']) }};
ssl_protocols TLSv1.2;
ssl_ciphers HIGH:!MEDIUM:!LOW:!aNULL:!NULL:!SHA;
@@ -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_facts['fqdn']) }}/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/{{ mastodon_host | default(ansible_facts['fqdn']) }}/privkey.pem;
{% endif %}
keepalive_timeout 70;