On Mon, 2011-05-16 at 22:32 -0700, Junio C Hamano wrote: > Jakub Narebski <jnareb@xxxxxxxxx> writes: > > > This commit changes gitweb behavior so that configuration in > > per-instance configuration file can _override_ settings from > > system-wide configuration file. > > > > Note that strictly speaking it is backwards incompatible change. > > I am not sure if we gain enough from this change. As the system-wide one > can be arbitrarily overriden by per-instance one, the goal of this change > cannot be to make sure that the system administrator can enforce the > system wide policy over all the gitweb instances. Currently if there is a local configuration file _there_is_no_system-wide_policy_. That's the problem. > I think the goal is to let per-instance configuration have an easy way to > inherit from a common sane default, but if that is the case, wouldn't it > be a lot safer and more backward compatible way to just instruct people to > include that common default configuration at the beginning of per-instance > configuration file instead? After all, you would need to give some advice > like this ... If that's currently being done anywhere this change will not cause any pain. If the default /etc/gitweb.conf contains a set of commented-out sample entries, as it should in the case of something like this, then there will be no problems. As the local configurations will override the system configuration items one by one, instead of wholesale and outright, those items most likely to be a problem will be set correctly in my estimation. >From my day job I happen to know that asking the user to please respect the existing policy by including it in their local configuration policy doesn't work out very well. What usually happens is the user removes whatever is there and replaces it with whatever the tutorial they are currently looking at has in it. I highly doubt we'll change all of the tutorials out on the Internet, or all of the mere mortals using them. We can change Gitweb. The difference between the current situation and the resultant one can be summed up thusly: Currently /etc/gitweb.conf only: System policy gitweb_config.perl only: Local policy both: Local policy ONLY New /etc/gitweb.conf only: System policy gitweb_config.perl only: Local policy both: Local policy overrides System policy on a per-configurable item basis -- -Drew Northup ________________________________________________ "As opposed to vegetable or mineral error?" -John Pescatore, SANS NewsBites Vol. 12 Num. 59 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html