Skip to content
Snippets Groups Projects
Commit 38f8a0b8 authored by McConahy, Renee Margaret's avatar McConahy, Renee Margaret
Browse files

Combine duplicate variables.

parent 7facc76c
No related branches found
No related tags found
No related merge requests found
......@@ -9,9 +9,8 @@
lockss_hostname: "{{ hostname }}"
lockss_ipaddr: "{{ external_ip }}"
lockss_external_ipaddr: "{{ external_ip }}"
lockss_access_subnet: 0.0.0.0/0
lockss_admin_email: root@localhost
lockss_firewall_trusted_ips:
lockss_trusted_ips:
- 192.168.0.0/16
roles:
- system-update
......
......@@ -14,7 +14,7 @@
state: enabled
permanent: true
immediate: true
loop: "{{ lockss_firewall_trusted_ips }}"
loop: "{{ lockss_trusted_ips }}"
- name: Allow management traffic from trusted zone.
firewalld:
......
......@@ -12,4 +12,4 @@
port: 24600:24699
proto: tcp
src: "{{ item }}"
loop: "{{ lockss_firewall_trusted_ips }}"
loop: "{{ lockss_trusted_ips }}"
......@@ -104,7 +104,7 @@
LOCKSS_IPADDR={{ lockss_ipaddr }}
LOCKSS_EXTERNAL_IPADDR={{ lockss_external_ipaddr | default }}
LOCKSS_V3_PORT=9729
LOCKSS_ACCESS_SUBNET={{ lockss_access_subnet }}
LOCKSS_ACCESS_SUBNET={{ lockss_trusted_ips | join(";") }}
LOCKSS_MAILHUB={{ lockss_mailhub_user | default("localhost") }}
LOCKSS_MAILHUB_USER={{ lockss_mailhub_user | default }}
LOCKSS_MAILHUB_PASSWORD={{ lockss_mailhub_user | default }}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment