Sorry, I don't follow, do you want me to change `$puppet_conf` value to `$confdir/puppet.conf`? If so, should I also remove `$puppetconf_path` from that file (and replace it everywhere with `$confdir`)?