{"thread":{"id":"24693","subject":"[Patch] Use a default for a bad env config file variable","startedAt":"2010-08-10T15:11:16Z","lastAt":"2010-08-11T13:36:52Z","messageCount":9,"participants":["James","Matthieu Moy","Ævar Arnfjörð Bjarmason","Michael J Gruber","James Shubin","Jakub Narebski","Jonathan Nieder"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"147647","messageId":"AANLkTi=42V8=26oEwcNOHubuK+VAf-QaYnvCLAKQ0xtg@mail.gmail.com","threadId":"24693","inReplyTo":null,"subject":"[Patch] Use a default for a bad env config file variable","fromName":"James","fromEmail":"purpleidea@gmail.com","sentAt":"2010-08-10T15:11:16Z","receivedAt":"2010-08-10T15:11:16Z","isPatch":true,"sender":{"key":"purpleidea@gmail.com","avatar":"https://gravatar.com/avatar/161941d0314aee3803e1012aa5dedb2403ed9dcd00ec769bce81435493abe18d?d=mp&s=160"},"body":"Hi git list, my name is James, and this is my first patch.\n\nIt's quite trivial really, all that changes is that if someone sets\nthe environment variable: $GITWEB_CONFIG_SYSTEM, and this points to\nsomething like: /srv/gitosis/gitweb.conf, which doesn't actually\nexist, then gitweb will default to trying out the built in default of\n/etc/gitweb.conf (if it was built with that var).\n\nThis patch should make it easier for people who are configuring\ngitweb+gitosis, so that a separate gitweb.conf config file can be used\nto call the main config, but which doesn't null out the system\ndefaults if it is missing.\n\nThank you in advance,\n_James\n\n\nFrom d29adf8c788b8a747bfd38dd7e10f684de9aa8e9 Mon Sep 17 00:00:00 2001\nFrom: James Shubin \nDate: Tue, 10 Aug 2010 10:30:22 -0400\nSubject: [PATCH] Use a default for a bad env config file variable.\n\n---\n gitweb/gitweb.perl | 4 ++++\n 1 files changed, 4 insertions(+), 0 deletions(-)\n\ndiff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl\nindex 4efeebc..43294e1 100755\n--- a/gitweb/gitweb.perl\n+++ b/gitweb/gitweb.perl\n@@ -605,6 +605,10 @@ sub evaluate_gitweb_config {\n \t} elsif (-e $GITWEB_CONFIG_SYSTEM) {\n \t\tdo $GITWEB_CONFIG_SYSTEM;\n \t\tdie $@ if $@;\n+\t# if config file from env is missing, then try the default anyways\n+\t} elsif (-e \"++GITWEB_CONFIG_SYSTEM++\") {\n+\t\tdo \"++GITWEB_CONFIG_SYSTEM++\";\n+\t\tdie $@ if $@;\n \t}\n }\n \n-- \n1.7.0.4\n\n"},{"id":"147652","messageId":"vpq4of2scen.fsf@bauges.imag.fr","threadId":"24693","inReplyTo":"AANLkTi=42V8=26oEwcNOHubuK+VAf-QaYnvCLAKQ0xtg@mail.gmail.com","subject":"Re: [Patch] Use a default for a bad env config file variable","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2010-08-10T15:41:36Z","receivedAt":"2010-08-10T15:41:36Z","isPatch":true,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Hi,\n\nJames writes:\n\n> Hi git list, my name is James, and this is my first patch.\n\nThen, I'll have to be the first person directing you to\nDocumentation/SubmittingPatches ;-).\n\nThe custom here is to send patches inline (git send-email can help),\nnot attached. Read about Signed-off-by too.\n\n(Don't know perl and gitweb enough to judge on the content\nunfortunately, sorry)\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"147654","messageId":"AANLkTi=UCJa9uT5i9TRB9hGsH1D8b9DgB49TPM5k1htQ@mail.gmail.com","threadId":"24693","inReplyTo":"vpq4of2scen.fsf@bauges.imag.fr","subject":"Re: [Patch] Use a default for a bad env config file variable","fromName":"James","fromEmail":"purpleidea@gmail.com","sentAt":"2010-08-10T15:54:43Z","receivedAt":"2010-08-10T15:54:43Z","isPatch":true,"sender":{"key":"purpleidea@gmail.com","avatar":"https://gravatar.com/avatar/161941d0314aee3803e1012aa5dedb2403ed9dcd00ec769bce81435493abe18d?d=mp&s=160"},"body":"Sorry about that,\nI guess I had only read the README.\nHope this is better:\n\n>From d29adf8c788b8a747bfd38dd7e10f684de9aa8e9 Mon Sep 17 00:00:00 2001\nFrom: James Shubin \nDate: Tue, 10 Aug 2010 10:30:22 -0400\nSubject: [PATCH] Use a default for a bad env config file variable.\n\n\nSigned-off-by: James Shubin \n---\n gitweb/gitweb.perl | 4 ++++\n 1 files changed, 4 insertions(+), 0 deletions(-)\n\ndiff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl\nindex 4efeebc..43294e1 100755\n--- a/gitweb/gitweb.perl\n+++ b/gitweb/gitweb.perl\n@@ -605,6 +605,10 @@ sub evaluate_gitweb_config {\n \t} elsif (-e $GITWEB_CONFIG_SYSTEM) {\n \t\tdo $GITWEB_CONFIG_SYSTEM;\n \t\tdie $@ if $@;\n+\t# if config file from env is missing, then try the default anyways\n+\t} elsif (-e \"++GITWEB_CONFIG_SYSTEM++\") {\n+\t\tdo \"++GITWEB_CONFIG_SYSTEM++\";\n+\t\tdie $@ if $@;\n \t}\n }\n\n-- \n1.7.0.4\n\n\n\nOn 8/10/10, Matthieu Moy wrote:\n> Hi,\n>\n>\n> James writes:\n>\n> > Hi git list, my name is James, and this is my first patch.\n>\n>\n> Then, I'll have to be the first person directing you to\n> Documentation/SubmittingPatches ;-).\n>\n> The custom here is to send patches inline (git send-email can help),\n> not attached. Read about Signed-off-by too.\n>\n> (Don't know perl and gitweb enough to judge on the content\n> unfortunately, sorry)\n>\n>\n> --\n> Matthieu Moy\n> http://www-verimag.imag.fr/~moy/\n>\n"},{"id":"147655","messageId":"AANLkTikDtK0vyRwJE3Un5uFkK7FzoWtiWpL8gPqLQjH5@mail.gmail.com","threadId":"24693","inReplyTo":"AANLkTi=UCJa9uT5i9TRB9hGsH1D8b9DgB49TPM5k1htQ@mail.gmail.com","subject":"Re: [Patch] Use a default for a bad env config file variable","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2010-08-10T16:02:48Z","receivedAt":"2010-08-10T16:02:48Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"On Tue, Aug 10, 2010 at 15:54, James wrote:\n> Sorry about that,\n> I guess I had only read the README.\n> Hope this is better:\n\nNot really, no. You should send the patches you produce with\ngit-format-patch with git-send-email, and try sending to yourself\nfirst and apply it with git-am (this is all mentioned in\nSubmittingPatches).\n\nThis is what your new patch looks like after being applied with\ngit-am:\n\n commit 7be6207e8923cd7c4c48243f5257a0fdba6bfa0a\n Author: James \n Date: Tue Aug 10 11:54:43 2010 -0400\n\n Use a default for a bad env config file variable\n\n Sorry about that,\n I guess I had only read the README.\n Hope this is better:\n\n From d29adf8c788b8a747bfd38dd7e10f684de9aa8e9 Mon Sep 17 00:00:00 2001\n From: James Shubin \n Date: Tue, 10 Aug 2010 10:30:22 -0400\n Subject: [PATCH] Use a default for a bad env config file variable.\n\n Signed-off-by: James Shubin \n\n diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl\n index 4efeebc..43294e1 100755\n --- a/gitweb/gitweb.perl\n +++ b/gitweb/gitweb.perl\n @@ -605,6 +605,10 @@ sub evaluate_gitweb_config {\n } elsif (-e $GITWEB_CONFIG_SYSTEM) {\n do $GITWEB_CONFIG_SYSTEM;\n die $@ if $@;\n + # if config file from env is missing, then try the default anyways\n + } elsif (-e \"++GITWEB_CONFIG_SYSTEM++\") {\n + do \"++GITWEB_CONFIG_SYSTEM++\";\n + die $@ if $@;\n }\n }\n\nI.e. your message has become part of the patch. To include commentary\non resend add it after -- and before the diffstat (also in\nSubmittingPatches).\n\nThanks.\n"},{"id":"147657","messageId":"4C617975.8000501@drmicha.warpmail.net","threadId":"24693","inReplyTo":"AANLkTi=UCJa9uT5i9TRB9hGsH1D8b9DgB49TPM5k1htQ@mail.gmail.com","subject":"Re: [Patch] Use a default for a bad env config file variable","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2010-08-10T16:08:21Z","receivedAt":"2010-08-10T16:08:21Z","isPatch":true,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"James venit, vidit, dixit 10.08.2010 17:54:\n> Sorry about that,\n> I guess I had only read the README.\n> Hope this is better:\n> \n> From d29adf8c788b8a747bfd38dd7e10f684de9aa8e9 Mon Sep 17 00:00:00 2001\n> From: James Shubin \n> Date: Tue, 10 Aug 2010 10:30:22 -0400\n> Subject: [PATCH] Use a default for a bad env config file variable.\n\nNow, make that commit subject\n\ngitweb: Use a default for a bad env config file variable\n\n(i.e. insert \"gitweb: \", delete the stop) and you're good to go ;)\n\nMichael\n\n> \n> \n> Signed-off-by: James Shubin \n> ---\n> gitweb/gitweb.perl | 4 ++++\n> 1 files changed, 4 insertions(+), 0 deletions(-)\n> \n> diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl\n> index 4efeebc..43294e1 100755\n> --- a/gitweb/gitweb.perl\n> +++ b/gitweb/gitweb.perl\n> @@ -605,6 +605,10 @@ sub evaluate_gitweb_config {\n> \t} elsif (-e $GITWEB_CONFIG_SYSTEM) {\n> \t\tdo $GITWEB_CONFIG_SYSTEM;\n> \t\tdie $@ if $@;\n> +\t# if config file from env is missing, then try the default anyways\n> +\t} elsif (-e \"++GITWEB_CONFIG_SYSTEM++\") {\n> +\t\tdo \"++GITWEB_CONFIG_SYSTEM++\";\n> +\t\tdie $@ if $@;\n> \t}\n> }\n> \n"},{"id":"147660","messageId":"1281458849.28858.18.camel@ping.CS.McGill.CA","threadId":"24693","inReplyTo":"AANLkTikDtK0vyRwJE3Un5uFkK7FzoWtiWpL8gPqLQjH5@mail.gmail.com","subject":"[PATCH v3] Gitweb: Use a default for a bad env config file variable","fromName":"James Shubin","fromEmail":"purpleidea@gmail.com","sentAt":"2010-08-10T16:47:29Z","receivedAt":"2010-08-10T16:47:29Z","isPatch":true,"sender":{"key":"purpleidea@gmail.com","avatar":"https://gravatar.com/avatar/161941d0314aee3803e1012aa5dedb2403ed9dcd00ec769bce81435493abe18d?d=mp&s=160"},"body":"From: James Shubin \nSigned-off-by: James Shubin \n---\nIt's quite trivial really, all that changes is that if someone sets\nthe environment variable: $GITWEB_CONFIG_SYSTEM, and this points to\nsomething like: /srv/gitosis/gitweb.conf, which doesn't actually\nexist, then gitweb will default to trying out the built in default of\n/etc/gitweb.conf (if it was built with that value).\n\nThis patch should make it easier for people who are configuring\ngitweb+gitosis, so that a separate gitweb.conf config file can be used\nto call the main config, but which doesn't null out the system\ndefaults if it is missing.\n\nPS: thanks to everyone for their patience with my first patch.\nThis applied cleanly with git am, let me know if I should do anything\nelse differently.\n\n gitweb/gitweb.perl | 4 ++++\n 1 files changed, 4 insertions(+), 0 deletions(-)\n\ndiff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl\nindex 4efeebc..43294e1 100755\n--- a/gitweb/gitweb.perl\n+++ b/gitweb/gitweb.perl\n@@ -605,6 +605,10 @@ sub evaluate_gitweb_config {\n \t} elsif (-e $GITWEB_CONFIG_SYSTEM) {\n \t\tdo $GITWEB_CONFIG_SYSTEM;\n \t\tdie $@ if $@;\n+\t# if config file from env is missing, then try the default anyways\n+\t} elsif (-e \"++GITWEB_CONFIG_SYSTEM++\") {\n+\t\tdo \"++GITWEB_CONFIG_SYSTEM++\";\n+\t\tdie $@ if $@;\n \t}\n }\n \n-- \n1.7.0.4\n\n\n-----Original Message-----\nFrom: Ævar Arnfjörð Bjarmason \nTo: James \nCc: Matthieu Moy , git@vger.kernel.org\nSubject: Re: [Patch] Use a default for a bad env config file variable\nDate: Tue, 10 Aug 2010 16:02:48 +0000\n\nOn Tue, Aug 10, 2010 at 15:54, James wrote:\n> Sorry about that,\n> I guess I had only read the README.\n> Hope this is better:\n\nNot really, no. You should send the patches you produce with\ngit-format-patch with git-send-email, and try sending to yourself\nfirst and apply it with git-am (this is all mentioned in\nSubmittingPatches).\n\nThis is what your new patch looks like after being applied with\ngit-am:\n\n commit 7be6207e8923cd7c4c48243f5257a0fdba6bfa0a\n Author: James \n Date: Tue Aug 10 11:54:43 2010 -0400\n\n Use a default for a bad env config file variable\n\n Sorry about that,\n I guess I had only read the README.\n Hope this is better:\n\n From d29adf8c788b8a747bfd38dd7e10f684de9aa8e9 Mon Sep 17 00:00:00 2001\n From: James Shubin \n Date: Tue, 10 Aug 2010 10:30:22 -0400\n Subject: [PATCH] Use a default for a bad env config file variable.\n\n Signed-off-by: James Shubin \n\n diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl\n index 4efeebc..43294e1 100755\n --- a/gitweb/gitweb.perl\n +++ b/gitweb/gitweb.perl\n @@ -605,6 +605,10 @@ sub evaluate_gitweb_config {\n } elsif (-e $GITWEB_CONFIG_SYSTEM) {\n do $GITWEB_CONFIG_SYSTEM;\n die $@ if $@;\n + # if config file from env is missing, then try the default anyways\n + } elsif (-e \"++GITWEB_CONFIG_SYSTEM++\") {\n + do \"++GITWEB_CONFIG_SYSTEM++\";\n + die $@ if $@;\n }\n }\n\nI.e. your message has become part of the patch. To include commentary\non resend add it after -- and before the diffstat (also in\nSubmittingPatches).\n\nThanks.\n"},{"id":"147700","messageId":"m3tyn22iqd.fsf@localhost.localdomain","threadId":"24693","inReplyTo":"1281458849.28858.18.camel@ping.CS.McGill.CA","subject":"Re: [PATCH v3] Gitweb: Use a default for a bad env config file variable","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2010-08-10T22:42:05Z","receivedAt":"2010-08-10T22:42:05Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"James Shubin writes:\n\n> From: James Shubin \n\nSmall nitpick: you need line like the above only if the From: header\nin your email is diferent from the authorship you want to have in\ncommit, i.e. when you are sending email from other email account, or\nwhen you are (re)sending someone's else patches.\n\nIn this patch situation it is not, I think, necessary.\n\n> Signed-off-by: James Shubin \n> ---\n> It's quite trivial really, all that changes is that if someone sets\n> the environment variable: $GITWEB_CONFIG_SYSTEM, and this points to\n> something like: /srv/gitosis/gitweb.conf, which doesn't actually\n> exist, then gitweb will default to trying out the built in default of\n> /etc/gitweb.conf (if it was built with that value).\n> \n> This patch should make it easier for people who are configuring\n> gitweb+gitosis, so that a separate gitweb.conf config file can be used\n> to call the main config, but which doesn't null out the system\n> defaults if it is missing.\n\nFirst, why it is needed? Why can't you just have GITWEB_CONFIG_SYSTEM\n(or GITWEB_CONFIG) environment variable visible to gitweb.cgi that\npoints to existing file?\n\nSecond, is there any history behind providing this fallback only for\n$GITWEB_CONFIG_SYSTEM variable, and not for $GITWEB_CONFIG? Currently\ngitweb use environment variable if it exists, falling back to build-time\nvalue (might be default), and using first of $GITWEB_CONFIG and \n$GITWEB_CONFIG_SYSTEM that exists.\n\n> PS: thanks to everyone for their patience with my first patch.\n> This applied cleanly with git am, let me know if I should do anything\n> else differently.\n> \n> gitweb/gitweb.perl | 4 ++++\n> 1 files changed, 4 insertions(+), 0 deletions(-)\n> \n> diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl\n> index 4efeebc..43294e1 100755\n> --- a/gitweb/gitweb.perl\n> +++ b/gitweb/gitweb.perl\n> @@ -605,6 +605,10 @@ sub evaluate_gitweb_config {\n> \t} elsif (-e $GITWEB_CONFIG_SYSTEM) {\n> \t\tdo $GITWEB_CONFIG_SYSTEM;\n> \t\tdie $@ if $@;\n> +\t# if config file from env is missing, then try the default anyways\n\nMinor nitpick: Actually that is not default, but build-time value, which\nhas a default.\n\n> +\t} elsif (-e \"++GITWEB_CONFIG_SYSTEM++\") {\n> +\t\tdo \"++GITWEB_CONFIG_SYSTEM++\";\n> +\t\tdie $@ if $@;\n> \t}\n> }\n> \n> -- \n> 1.7.0.4\n\n-- \nJakub Narebski\nPoland\nShadeHawk on #git\n"},{"id":"147705","messageId":"20100811000846.GF2099@burratino","threadId":"24693","inReplyTo":"1281458849.28858.18.camel@ping.CS.McGill.CA","subject":"Re: [PATCH v3] Gitweb: Use a default for a bad env config file variable","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-08-11T00:08:46Z","receivedAt":"2010-08-11T00:08:46Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Hi James,\n\nJames Shubin wrote:\n\n> Signed-off-by: James Shubin \n[...]\n> It's quite trivial really, all that changes is that if someone sets\n> the environment variable: $GITWEB_CONFIG_SYSTEM, and this points to\n> something like: /srv/gitosis/gitweb.conf, which doesn't actually\n> exist, then gitweb will default to trying out the built in default of\n> /etc/gitweb.conf (if it was built with that value).\n[...]\n|\tour $GITWEB_CONFIG = $ENV{'GITWEB_CONFIG'} || \"++GITWEB_CONFIG++\";\n|\tour $GITWEB_CONFIG_SYSTEM = $ENV{'GITWEB_CONFIG_SYSTEM'} || \"++GITWEB_CONFIG_SYSTEM++\"; # die if there are errors parsing config file\n|\tif (-e $GITWEB_CONFIG) {\n|\t\tdo $GITWEB_CONFIG;\n|\t\tdie $@ if $@;\n|\t} elsif (-e $GITWEB_CONFIG_SYSTEM) {\n|\t\tdo $GITWEB_CONFIG_SYSTEM;\n|\t\tdie $@ if $@;\n|\t} elsif (-e \"++GITWEB_CONFIG_SYSTEM++\") {\n|\t\t...\n\nInteresting. I am a bit nervous that this might be confusing.\ncc-ing Jakub for input.\n"},{"id":"147762","messageId":"1281533812.28858.50.camel@ping.CS.McGill.CA","threadId":"24693","inReplyTo":"m3tyn22iqd.fsf@localhost.localdomain","subject":"Re: [PATCH v3] Gitweb: Use a default for a bad env config file variable","fromName":"James Shubin","fromEmail":"purpleidea@gmail.com","sentAt":"2010-08-11T13:36:52Z","receivedAt":"2010-08-11T13:36:52Z","isPatch":true,"sender":{"key":"purpleidea@gmail.com","avatar":"https://gravatar.com/avatar/161941d0314aee3803e1012aa5dedb2403ed9dcd00ec769bce81435493abe18d?d=mp&s=160"},"body":"Thanks for all the \"sending patches\" input; it's useful, even if my\npatch isn't ;)\nI suppose I was trying to provide more defaults to work around some\nweirdly setup servers that I have inherited. Upon reconsideration, I'll\nwithdraw the patch.\nThanks for your time, and thanks for your nitpicks.\n\n_James\n\n\n-----Original Message-----\n> First, why it is needed? Why can't you just have GITWEB_CONFIG_SYSTEM\n> (or GITWEB_CONFIG) environment variable visible to gitweb.cgi that\n> points to existing file?\n\n\nSecond, is there any history behind providing this fallback only for\n$GITWEB_CONFIG_SYSTEM variable, and not for $GITWEB_CONFIG? Currently\ngitweb use environment variable if it exists, falling back to build-time\nvalue (might be default), and using first of $GITWEB_CONFIG and \n$GITWEB_CONFIG_SYSTEM that exists.\n\n> PS: thanks to everyone for their patience with my first patch.\n> This applied cleanly with git am, let me know if I should do anything\n> else differently.\n> \n> gitweb/gitweb.perl | 4 ++++\n> 1 files changed, 4 insertions(+), 0 deletions(-)\n> \n> diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl\n> index 4efeebc..43294e1 100755\n> --- a/gitweb/gitweb.perl\n> +++ b/gitweb/gitweb.perl\n> @@ -605,6 +605,10 @@ sub evaluate_gitweb_config {\n> \t} elsif (-e $GITWEB_CONFIG_SYSTEM) {\n> \t\tdo $GITWEB_CONFIG_SYSTEM;\n> \t\tdie $@ if $@;\n> +\t# if config file from env is missing, then try the default anyways\n\nMinor nitpick: Actually that is not default, but build-time value, which\nhas a default.\n\n> +\t} elsif (-e \"++GITWEB_CONFIG_SYSTEM++\") {\n> +\t\tdo \"++GITWEB_CONFIG_SYSTEM++\";\n> +\t\tdie $@ if $@;\n> \t}\n> }\n> \n> -- \n> 1.7.0.4\n"}]}