The puppet.conf is ideal for configuration of the location of codedir with the codedir setting. However, Puppet Server uses its JRuby-puppet.master-code-dir Setting with the puppetserver.conf. In the case of non-default codedir, you have to change both settings.
