Implement better IP address/network notation.

This commit is contained in:
Andreas B. Mundt 2019-11-28 16:34:37 +01:00
parent 3670bf6597
commit 2ff1354fe3
8 changed files with 9 additions and 10 deletions

View file

@ -176,7 +176,7 @@
- name: "make 'kerberos' an alias hostname resolvable from the LAN"
replace:
path: /etc/hosts
regexp: "^({{ ipaddr_lan }}\\s.+)$"
regexp: "^({{ ipaddr_lan | ipaddr('address') }}\\s.+)$"
replace: '\1 kerberos'
when: not krb5kdc.stat.exists

View file

@ -65,7 +65,7 @@
- name: "make 'ldap' an alias hostname resolvable from the LAN"
replace:
path: /etc/hosts
regexp: "^({{ ipaddr_lan }}\\s.+)$"
regexp: "^({{ ipaddr_lan | ipaddr('address') }}\\s.+)$"
replace: '\1 ldap'
when: not slapd.stat.exists

View file

@ -25,14 +25,14 @@
dest: /etc/exports
insertbefore: EOF
block: |
{{ export_root }} *(sec=krb5p,rw,fsid=0,crossmnt,no_subtree_check)
{{ export_root }}/home/ *(sec=krb5p,rw,no_subtree_check)
{{ export_root }} {{ ipaddr_lan | ipaddr('subnet') }}(sec=krb5p,rw,fsid=0,crossmnt,no_subtree_check)
{{ export_root }}/home/ {{ ipaddr_lan | ipaddr('subnet') }}(sec=krb5p,rw,no_subtree_check)
notify: "restart nfs-kernel-server"
- name: "make 'nfs' an alias hostname resolvable from the LAN"
replace:
path: /etc/hosts
regexp: "^({{ ipaddr_lan }}\\s.+)$"
regexp: "^({{ ipaddr_lan | ipaddr('address') }}\\s.+)$"
replace: '\1 nfs'
when: not exports.stat.exists

View file

@ -30,4 +30,4 @@
replace:
path: /etc/hosts
regexp: '^(127\.0\.1\.1.*)$'
replace: '#\1\n{{ ipaddr_lan }} {{ ansible_hostname }}.{{ ansible_domain }} {{ ansible_hostname }}'
replace: '#\1\n{{ ipaddr_lan | ipaddr("address") }} {{ ansible_hostname }}.{{ ansible_domain }} {{ ansible_hostname }}'

View file

@ -1,4 +1,4 @@
auto {{ if_lan }}
allow-hotplug {{ if_lan }}
iface {{ if_lan }} inet static
address {{ ipaddr_lan }}/24
address {{ ipaddr_lan }}

View file

@ -2,4 +2,3 @@ auto {{ if_lan }}
allow-hotplug {{ if_lan }}
iface {{ if_lan }} inet static
address {{ ipaddr_lan }}
netmask 255.255.255.0