[Dnsmasq-discuss] new isp with new setup, how to change dnsmasq to accomodate

[Rance Hall]

hey gang:

I got a new ISP yesterday and the network setup is slightly different,
and now my dnsmasq doesnt work the way I want it to.

BRIEF SETUP DESCRIPTION --- OLD WAY
all ethernet adapters on my home firewall/internal dhcp/dns server are
static private ips
the dsl modem has the public ip address.
the machine that runs dnsmasq has a /etc/resolv.conf file that points
to itself for name resolution.
the real name servers are in a file called /etc/resolv.conf.dnsmasq
and dnsmasq is configured to read this file instead of
/etc/resolv.conf

This is so that the server itself resolves names in the same way that
the clients do.


BRIEF SETUP --- NEW WAY

public ip address is acquired by eth0 using dhcp client on my server
(new modem operates in bridge mode and does not have its own ip)
the dhcp client overwrite /etc/resolv.conf and dnsmasq is set to use
that file for upstream name resolution.

-------------------------------------------

I want to restore the ability to have the server resolv names the same
way the clients to  (meaning that the internal domain name can be
resolved on the gateway server itself.

This is essential for ssh tunneling, etc.

so, as I see it I can write a dhclient-exit-hooks script (to preserve
future upgrade capability) that does the following:

1) copies the new /etc/resolv.conf file to /etc/resolv.conf.dnsmasq
2) copies a static /etc/resolv.conf.perm to /etc/resolv.conf
3) sends dnsmasq a reload/reread config files instruction
4) if needed, reloads other network services that need to be
restarted/reconfigured

is there a another/better way to do what Im trying to do?