Changeset 41 in bookmarks


Ignore:
Timestamp:
05/30/13 15:15:05 (11 years ago)
Author:
peter
Message:
  • move the reverse proxy check and change to SERVER_NAME from the BookmarkApp to the index.cgi script
  • the dbname is passed in as a parameter to BookmarkApp
Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/BookmarkApp.pm

    r40 r41  
    1111use Bookmarks; 
    1212use URI; 
    13  
    14 my $dbname = 'fk.db'; 
    1513 
    1614sub setup { 
     
    2422        edit 
    2523    }]); 
     24 
    2625    my $base_uri = URI->new; 
    2726    $base_uri->scheme('http'); 
    28     $base_uri->host($ENV{HTTP_X_FORWARDED_HOST} || $ENV{SERVER_NAME}); 
     27    $base_uri->host($ENV{SERVER_NAME}); 
    2928    $base_uri->port($ENV{SERVER_PORT}); 
    3029    $base_uri->path($ENV{SCRIPT_NAME} . '/'); 
    3130 
    3231    my $bookmarks = Bookmarks->new({ 
    33         dbname   => $dbname, 
     32        dbname   => $self->param('dbname'), 
    3433        base_uri => $base_uri, 
    3534    }); 
  • trunk/index.cgi

    r30 r41  
    1919 
    2020package main; 
    21 BookmarkApp::Dispatch->dispatch(); 
     21# check for whether we are behind a reverse proxy, and adjust the SERVER_NAME accordingly 
     22# TODO: use something like Plack::Middlware::ReverseProxy instead 
     23$ENV{SERVER_NAME} = $ENV{HTTP_X_FORWARDED_HOST} if $ENV{HTTP_X_FORWARDED_HOST}; 
     24 
     25BookmarkApp::Dispatch->dispatch( 
     26    args_to_new => { 
     27        #TODO: dbname should be in a config file 
     28        PARAMS => { dbname => 'fk.db' }, 
     29    } 
     30); 
Note: See TracChangeset for help on using the changeset viewer.