tested and seems to work

[git.ikiwiki.info.git] / IkiWiki / Wrapper.pm

diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index bd134c9a35c2fa87eef5a505e43984bdc26cc1d5..84cc7540bbfa5e63b8d9d85d21cc0b0d63bbb478 100644 (file)
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -8,6 +8,26 @@ use File::Spec;
 use Data::Dumper;
 use IkiWiki;
 
 use Data::Dumper;
 use IkiWiki;
 

+sub gen_wrappers () {
+       debug(gettext("generating wrappers.."));
+       my %origconfig=(%config);
+       foreach my $wrapper (@{$config{wrappers}}) {
+               %config=(%origconfig, %{$wrapper});
+               $config{verbose}=$config{setupverbose}
+                       if exists $config{setupverbose};
+               $config{syslog}=$config{setupsyslog}
+                       if exists $config{setupsyslog};
+               delete @config{qw(setupsyslog setupverbose wrappers genwrappers rebuild)};
+               checkconfig();
+               if (! $config{cgi} && ! $config{post_commit} &&
+                   ! $config{test_receive}) {
+                       $config{post_commit}=1;
+               }
+               gen_wrapper();
+       }
+       %config=(%origconfig);
+}
+

 sub gen_wrapper () {
        $config{srcdir}=File::Spec->rel2abs($config{srcdir});
        $config{destdir}=File::Spec->rel2abs($config{destdir});
 sub gen_wrapper () {
        $config{srcdir}=File::Spec->rel2abs($config{srcdir});
        $config{destdir}=File::Spec->rel2abs($config{destdir});


@@ -29,6 +49,7 @@ sub gen_wrapper () {
        push @envsave, qw{REMOTE_ADDR QUERY_STRING REQUEST_METHOD REQUEST_URI
                       CONTENT_TYPE CONTENT_LENGTH GATEWAY_INTERFACE
                       HTTP_COOKIE REMOTE_USER HTTPS REDIRECT_STATUS
        push @envsave, qw{REMOTE_ADDR QUERY_STRING REQUEST_METHOD REQUEST_URI
                       CONTENT_TYPE CONTENT_LENGTH GATEWAY_INTERFACE
                       HTTP_COOKIE REMOTE_USER HTTPS REDIRECT_STATUS

+                      HTTP_HOST SERVER_PORT HTTPS

                       REDIRECT_URL} if $config{cgi};
        my $envsave="";
        foreach my $var (@envsave) {
                       REDIRECT_URL} if $config{cgi};
        my $envsave="";
        foreach my $var (@envsave) {


@@ -108,7 +129,7 @@ EOF
 #include <sys/file.h>
 
 extern char **environ;
 #include <sys/file.h>
 
 extern char **environ;

-char *newenviron[$#envsave+6];
+char *newenviron[$#envsave+7];

 int i=0;
 
 void addenv(char *var, char *val) {
 int i=0;
 
 void addenv(char *var, char *val) {


@@ -127,6 +148,7 @@ $check_commit_hook
 @wrapper_hooks
 $envsave
        newenviron[i++]="HOME=$ENV{HOME}";
 @wrapper_hooks
 $envsave
        newenviron[i++]="HOME=$ENV{HOME}";

+       newenviron[i++]="PATH=$ENV{PATH}";

        newenviron[i++]="WRAPPED_OPTIONS=$configstring";
 
 #ifdef __TINYC__
        newenviron[i++]="WRAPPED_OPTIONS=$configstring";
 
 #ifdef __TINYC__