Formulas iterating over dictionaries should use the items() method instead of iteritems() because the latter method has been removed from Python 3. While the items() method in Python 2 uses more memory than iteritems(), these dictionaries are typically small (e.g., sets of settings from Pillar).

• use defaults.yaml & Co.
• reduce Pillar data
  i.e. this needs to go:

dnsmasq:
  dnsmasq_conf: salt://dnsmasq/files/dnsmasq.conf
  dnsmasq_hosts: salt://dnsmasq/files/dnsmasq.hosts
  dnsmasq_cnames: salt://dnsmasq/files/dnsmasq.cnames
  dnsmasq_conf_dir: salt://dnsmasq/files/dnsmasq.d

Is your feature request related to a problem?

If the resolvconf package is installed (enabled by default for Debian based distributions), dnsmasq will use its output rather than the contents of '/etc/resolv.conf' to find upstream nameservers. Uncommenting the "IGNORE_RESOLVCONF=yes" line in '/etc/default/dnsmasq' inhibits this behaviour. Note that including a "resolv-file=" line in '/etc/dnsmasq.conf' is not enough to override resolvconf if it is installed: the line "IGNORE_RESOLVCONF=yes" must be uncommented.

Describe the solution you'd like

A file.uncomment state does the job.

/etc/default/dnsmasq:
  file.uncomment:
    - regex: 'IGNORE_RESOLVCONF=yes'
    - char: '#'
    - backup: False

• Use (OS) defaults instead of hardcoded file path;
• Enable/disable ignore_resolvconf based on pillar config, with a default value.

Describe alternatives you've considered

An alternative solution might be to optionally remove the resolvconf package - something that imo shouldn't be managed in this dnsmasq formula - or to use the resolver formula to manage/remove it.

Additional context

Sorry, I lack the knowledge to create a PR myself.

Support for FreeBSD is lacking in this formula, and map.jinja doesn't seem to allow a way to slime it in via pillar lookup, unless you're running a very old Salt.

I have a Debian config that includes additional hosts and cnames. The additional dnsmasq.{cnames,hosts} are generated in /etc, but there is nothing in dnsmasq.conf to include them. The dnsmasq.d file in files contains jinja that refers to addn-hosts, but nothing gets processed.

The init.d service spec contains an entry to add in files from /etc/dnsmasq.d but the files aren't in there.

The package dns-root-data has been updated in repository and the new root.ds file has tabs instead of spaces as in version u1.

The below condition now fails because the sed editor is looking for spaces and does not find them resulting in non standard startup options, hence resulting in error "Junk found on command line"

ROOT_DS="/usr/share/dns/root.ds"

if [ -f $ROOT_DS ]; then
DNSMASQ_OPTS="$DNSMASQ_OPTS sed -e s/". IN DS "/--trust-anchor=.,/ -e s/" "/,/g $ROOT_DS | tr '\n' ' '"
fi

the sed editor options need to change and one of the working set is this.

DNSMASQ_OPTS="$DNSMASQ_OPTS sed -e s/".\t[0-9]*\tIN\tDS\t"/--trust-anchor=.,/ -e s/" "/,/g $ROOT_DS | tr '\n' ' '"

We can have another regex pattern which takes care of any white space, i am not good at regex hence someone will need to fix this.