vars/<OS>.yml: Remove dns_service, dns_user, dhcp_service

vars/debian-11.yml

@@ -4,23 +4,17 @@ is_debuntu: True
 is_debian: True    # Opposite of is_ubuntu for now
 is_debian_11: 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
-dhcp_service: isc-dhcp-server
-dns_user: bind
-
 proxy: squid
 proxy_user: proxy
 apache_service: apache2
 apache_conf_dir: apache2/sites-available
 apache_user: www-data
 apache_log_dir: /var/log/apache2
+apache_log: /var/log/apache2/access.log
 smb_service: smbd
 nmb_service: nmbd
 systemctl_program: /bin/systemctl
 mysql_service: mariadb
-apache_log: /var/log/apache2/access.log
 sshd_package: openssh-server
 sshd_service: ssh
 php_version: 7.4

vars/debian-12.yml

@@ -4,23 +4,17 @@ is_debuntu: True
 is_debian: True    # Opposite of is_ubuntu for now
 is_debian_12: 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
-dhcp_service: isc-dhcp-server
-dns_user: bind
-
 proxy: squid
 proxy_user: proxy
 apache_service: apache2
 apache_conf_dir: apache2/sites-available
 apache_user: www-data
 apache_log_dir: /var/log/apache2
+apache_log: /var/log/apache2/access.log
 smb_service: smbd
 nmb_service: nmbd
 systemctl_program: /bin/systemctl
 mysql_service: mariadb
-apache_log: /var/log/apache2/access.log
 sshd_package: openssh-server
 sshd_service: ssh
 php_version: 8.1

vars/linuxmint-20.yml

@@ -6,23 +6,17 @@ is_ubuntu_20: True
 is_linuxmint: True
 is_linuxmint_20: True
 
-# 2019-03-23: 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_user: bind
-dhcp_service: isc-dhcp-server
-
 proxy: squid
 proxy_user: proxy
 apache_service: apache2
 apache_user: www-data
 apache_conf_dir: apache2/sites-available
 apache_log_dir: /var/log/apache2
+apache_log: /var/log/apache2/access.log
 smb_service: smbd
 nmb_service: nmbd
 systemctl_program: /bin/systemctl
 mysql_service: mariadb
-apache_log: /var/log/apache2/access.log
 sshd_package: openssh-server
 sshd_service: ssh
 php_version: 7.4

vars/linuxmint-21.yml

@@ -6,23 +6,17 @@ is_ubuntu_2204: True
 is_linuxmint: True
 is_linuxmint_21: True
 
-# 2019-03-23: 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_user: bind
-dhcp_service: isc-dhcp-server
-
 proxy: squid
 proxy_user: proxy
 apache_service: apache2
 apache_user: www-data
 apache_conf_dir: apache2/sites-available
 apache_log_dir: /var/log/apache2
+apache_log: /var/log/apache2/access.log
 smb_service: smbd
 nmb_service: nmbd
 systemctl_program: /bin/systemctl
 mysql_service: mariadb
-apache_log: /var/log/apache2/access.log
 sshd_package: openssh-server
 sshd_service: ssh
 php_version: 8.1

vars/raspbian-11.yml

@@ -6,23 +6,17 @@ is_debian_11: True
 is_raspbian: True
 is_raspbian_11: True
 
-# 2019-03-23: 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_user: bind
-dhcp_service: isc-dhcp-server
-
 proxy: squid
 proxy_user: proxy
 apache_service: apache2
 apache_conf_dir: apache2/sites-available
 apache_user: www-data
 apache_log_dir: /var/log/apache2
+apache_log: /var/log/apache2/access.log
 smb_service: smbd
 nmb_service: nmbd
 systemctl_program: /bin/systemctl
 mysql_service: mariadb
-apache_log: /var/log/apache2/access.log
 sshd_package: ssh
 sshd_service: ssh
 php_version: 7.4

vars/ubuntu-2004.yml

@@ -4,23 +4,17 @@ is_debuntu: True
 is_ubuntu: True    # Opposite of is_debian for now
 is_ubuntu_2004: True
 
-# 2019-03-23: 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_user: bind
-dhcp_service: isc-dhcp-server
-
 proxy: squid
 proxy_user: proxy
 apache_service: apache2
 apache_user: www-data
 apache_conf_dir: apache2/sites-available
 apache_log_dir: /var/log/apache2
+apache_log: /var/log/apache2/access.log
 smb_service: smbd
 nmb_service: nmbd
 systemctl_program: /bin/systemctl
 mysql_service: mariadb
-apache_log: /var/log/apache2/access.log
 sshd_package: openssh-server
 sshd_service: ssh
 php_version: 7.4

vars/ubuntu-2204.yml

@@ -4,23 +4,17 @@ is_debuntu: True
 is_ubuntu: True    # Opposite of is_debian for now
 is_ubuntu_2204: True
 
-# 2019-03-23: 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_user: bind
-dhcp_service: isc-dhcp-server
-
 proxy: squid
 proxy_user: proxy
 apache_service: apache2
 apache_user: www-data
 apache_conf_dir: apache2/sites-available
 apache_log_dir: /var/log/apache2
+apache_log: /var/log/apache2/access.log
 smb_service: smbd
 nmb_service: nmbd
 systemctl_program: /bin/systemctl
 mysql_service: mariadb
-apache_log: /var/log/apache2/access.log
 sshd_package: openssh-server
 sshd_service: ssh
 php_version: 8.1

vars/ubuntu-2210.yml

@@ -4,23 +4,17 @@ is_debuntu: True
 is_ubuntu: True    # Opposite of is_debian for now
 is_ubuntu_2210: True
 
-# 2019-03-23: 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_user: bind
-dhcp_service: isc-dhcp-server
-
 proxy: squid
 proxy_user: proxy
 apache_service: apache2
 apache_user: www-data
 apache_conf_dir: apache2/sites-available
 apache_log_dir: /var/log/apache2
+apache_log: /var/log/apache2/access.log
 smb_service: smbd
 nmb_service: nmbd
 systemctl_program: /bin/systemctl
 mysql_service: mariadb
-apache_log: /var/log/apache2/access.log
 sshd_package: openssh-server
 sshd_service: ssh
 php_version: 8.1