1
0
Fork 0
mirror of https://github.com/iiab/iiab.git synced 2025-03-09 15:40:17 +00:00

Merge pull request #1441 from holta/vars-confusing-yml-files

Make vars/<OS>.yml files less confusing (with dnsmasq, we can generally ignore "dns_service: named" & "dns_service: bind9")
This commit is contained in:
A Holt 2019-01-31 20:41:04 -05:00 committed by GitHub
commit 46da9520c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 33 additions and 0 deletions

View file

@ -2,8 +2,11 @@ is_redhat: True
is_centos: True is_centos: True
is_centos_7: True is_centos_7: True
# 2019-01-31: These apply if-only-if named_install and/or dhcpd_install are True
# (This is quite rare now that vars/default_vars.yml sets dnsmasq_install: True)
dns_service: named dns_service: named
dns_user: named dns_user: named
proxy: squid proxy: squid
proxy_user: squid proxy_user: squid
apache_service: httpd apache_service: httpd

View file

@ -2,9 +2,12 @@ is_debuntu: True
is_debian: True is_debian: True
is_debian_10: True is_debian_10: True
# 2019-01-31: These apply if-only-if named_install and/or dhcpd_install are True
# (This is quite rare now that vars/default_vars.yml sets dnsmasq_install: True)
dns_service: bind9 dns_service: bind9
dhcp_service: isc-dhcp-server dhcp_service: isc-dhcp-server
dns_user: bind dns_user: bind
proxy: squid proxy: squid
proxy_user: proxy proxy_user: proxy
apache_service: apache2 apache_service: apache2

View file

@ -2,8 +2,11 @@ is_debuntu: True
is_debian: True is_debian: True
is_debian_8: True is_debian_8: True
# 2019-01-31: These apply if-only-if named_install and/or dhcpd_install are True
# (This is quite rare now that vars/default_vars.yml sets dnsmasq_install: True)
dns_service: bind9 dns_service: bind9
dns_user: bind dns_user: bind
proxy: squid3 proxy: squid3
proxy_user: proxy proxy_user: proxy
apache_service: apache2 apache_service: apache2

View file

@ -2,9 +2,12 @@ is_debuntu: True
is_debian: True is_debian: True
is_debian_9: True is_debian_9: True
# 2019-01-31: These apply if-only-if named_install and/or dhcpd_install are True
# (This is quite rare now that vars/default_vars.yml sets dnsmasq_install: True)
dns_service: bind9 dns_service: bind9
dhcp_service: isc-dhcp-server dhcp_service: isc-dhcp-server
dns_user: bind dns_user: bind
proxy: squid proxy: squid
proxy_user: proxy proxy_user: proxy
apache_service: apache2 apache_service: apache2

View file

@ -2,8 +2,11 @@ is_redhat: True
is_fedora: True is_fedora: True
is_fedora_18: True is_fedora_18: True
# 2019-01-31: These apply if-only-if named_install and/or dhcpd_install are True
# (This is quite rare now that vars/default_vars.yml sets dnsmasq_install: True)
dns_service: named dns_service: named
dns_user: named dns_user: named
proxy: squid proxy: squid
proxy_user: squid proxy_user: squid
apache_service: httpd apache_service: httpd

View file

@ -2,8 +2,11 @@ is_redhat: True
is_fedora: True is_fedora: True
is_fedora_22: True is_fedora_22: True
# 2019-01-31: These apply if-only-if named_install and/or dhcpd_install are True
# (This is quite rare now that vars/default_vars.yml sets dnsmasq_install: True)
dns_service: named dns_service: named
dns_user: named dns_user: named
proxy: squid proxy: squid
proxy_user: squid proxy_user: squid
apache_service: httpd apache_service: httpd

View file

@ -5,8 +5,11 @@ is_raspbian_8: True
is_rpi: True is_rpi: True
rtc_id: ds3231 rtc_id: ds3231
# 2019-01-31: These apply if-only-if named_install and/or dhcpd_install are True
# (This is quite rare now that vars/default_vars.yml sets dnsmasq_install: True)
dns_service: bind9 dns_service: bind9
dns_user: bind dns_user: bind
proxy: squid3 proxy: squid3
proxy_user: proxy proxy_user: proxy
apache_service: apache2 apache_service: apache2

View file

@ -5,9 +5,12 @@ is_raspbian_9: True
is_rpi: True is_rpi: True
rtc_id: ds3231 rtc_id: ds3231
# 2019-01-31: These apply if-only-if named_install and/or dhcpd_install are True
# (This is quite rare now that vars/default_vars.yml sets dnsmasq_install: True)
dns_service: bind9 dns_service: bind9
dns_user: bind dns_user: bind
dhcp_service: isc-dhcp-server dhcp_service: isc-dhcp-server
proxy: squid proxy: squid
proxy_user: proxy proxy_user: proxy
apache_service: apache2 apache_service: apache2

View file

@ -2,9 +2,12 @@ is_debuntu: True
is_ubuntu: True is_ubuntu: True
is_ubuntu_16: True is_ubuntu_16: True
# 2019-01-31: These apply if-only-if named_install and/or dhcpd_install are True
# (This is quite rare now that vars/default_vars.yml sets dnsmasq_install: True)
dns_service: bind9 dns_service: bind9
dns_user: bind dns_user: bind
dhcp_service: isc-dhcp-server dhcp_service: isc-dhcp-server
proxy: squid proxy: squid
proxy_user: proxy proxy_user: proxy
apache_service: apache2 apache_service: apache2

View file

@ -2,9 +2,12 @@ is_debuntu: True
is_ubuntu: True is_ubuntu: True
is_ubuntu_17: True is_ubuntu_17: True
# 2019-01-31: These apply if-only-if named_install and/or dhcpd_install are True
# (This is quite rare now that vars/default_vars.yml sets dnsmasq_install: True)
dns_service: bind9 dns_service: bind9
dns_user: bind dns_user: bind
dhcp_service: isc-dhcp-server dhcp_service: isc-dhcp-server
proxy: squid proxy: squid
proxy_user: proxy proxy_user: proxy
apache_service: apache2 apache_service: apache2

View file

@ -2,9 +2,12 @@ is_debuntu: True
is_ubuntu: True is_ubuntu: True
is_ubuntu_18: True is_ubuntu_18: True
# 2019-01-31: These apply if-only-if named_install and/or dhcpd_install are True
# (This is quite rare now that vars/default_vars.yml sets dnsmasq_install: True)
dns_service: bind9 dns_service: bind9
dns_user: bind dns_user: bind
dhcp_service: isc-dhcp-server dhcp_service: isc-dhcp-server
proxy: squid proxy: squid
proxy_user: proxy proxy_user: proxy
apache_service: apache2 apache_service: apache2