diff --git a/docs/general.md b/docs/general.md index 3ecd8c2..f9bfc1a 100644 --- a/docs/general.md +++ b/docs/general.md @@ -2,6 +2,6 @@ These variables might be required by multiple roles and need to be defined. Example values below. ``` -email: 'admin@domain.tld' +admin_email: 'admin@domain.tld' ``` diff --git a/galaxy.yml b/galaxy.yml index 99f8d2f..8ba3d67 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -2,7 +2,7 @@ namespace: uumas name: general -version: 0.4.1 +version: 0.4.2 readme: README.md authors: - uumas diff --git a/roles/caddy/tasks/main.yml b/roles/caddy/tasks/main.yml index 7407961..68eb30f 100644 --- a/roles/caddy/tasks/main.yml +++ b/roles/caddy/tasks/main.yml @@ -26,7 +26,7 @@ blockinfile: path: /etc/caddy/Caddyfile marker: "{mark}" - marker_begin: ':80' + marker_begin: ':80 {' marker_end: '# https://caddyserver.com/docs/caddyfile' state: absent validate: 'caddy validate --config %s --adapter caddyfile' @@ -38,7 +38,7 @@ marker: "# {mark} ANSIBLE MANAGED BLOCK general" block: | { - email {{ email }} + email {{ admin_email }} } validate: 'caddy validate --config %s --adapter caddyfile' backup: yes