Skip to content
Snippets Groups Projects
Commit 7ca75353 authored by Lars Beckers's avatar Lars Beckers
Browse files

webserver: fix linter issues; move password lookups to vars

parent 4ab83864
No related branches found
No related tags found
1 merge request!4WIP: add acmebot role
This commit is part of merge request !4. Comments created here will be created in the context of that merge request.
......@@ -7,3 +7,4 @@ webserver_enable_ipv6: true
webserver_resolver: "{{ nameservers }}"
disallow_apache2: true
webservers: []
zabbix_password: "{{ lookup('passwordstore', zabbix_user) }}"
......@@ -2,7 +2,8 @@
# file: webserver/handlers/main.yml
- name: reload systemd service files
command: systemctl daemon-reload
systemd:
daemon_reload: true
- name: restart nginx
service:
......
---
# file: webserver/tasks/main.yml
- include_vars:
- name: include debian version specific configuration
include_vars:
file: "{{debian_version|default('fallback')}}.yml"
- name: ensure nginx is installed
......
......@@ -4,9 +4,10 @@
zabbix_check:
zabbix_url: "{{zabbix_server}}"
zabbix_user: "{{zabbix_user}}"
zabbix_password: "{{lookup('passwordstore', zabbix_user)}}"
zabbix_password: "{{zabbix_password}}"
hostname: "{{ansible_fqdn}}"
name: "{{item.0.name}} {{item.1.server_name}}"
# yamllint disable-line rule:line-length
state: "{{'present' if item.0.enabled and item.1.zabbix_check|default(true) else 'absent'}}"
steps:
- url: "https://{{item.1.server_name}}{{item.1.zabbix_check_url|default('/')}}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment