Wait for network-online, drop DHCP while still dhcp so dhcpcd exits before writing static resolv.conf. Do not touch dhcpcd.conf.
they will be versioned and accessed through a git web interface instead of a static website