Changeset 621

Timestamp:

01/29/05 02:08:30 (4 years ago)

Author:

dom

Message:

Use environment variable OPENGUIDES_CONFIG_FILE for config file location;
will be useful for mod_perl. Also add error checking to OpenGuides::Config
config file opening.

Location:

trunk

Files:

• lib/OpenGuides/Config.pm (modified) (1 diff)
• newpage.cgi (modified) (1 diff)
• preferences.cgi (modified) (1 diff)
• supersearch.cgi (modified) (1 diff)
• wiki.cgi (modified) (1 diff)

trunk/lib/OpenGuides/Config.pm

@@ -83 +83 @@
     my %stored;
     if ( $args{file} ) {
-        my $read_config = Config::Tiny->read( $args{file} );
+        my $read_config = Config::Tiny->read( $args{file} ) or
+            die "Cannot read config file $args{file}";
         %stored = $read_config ? %{ $read_config->{_} } : ();
     } elsif ( $args{vars} ) {

trunk/newpage.cgi

@@ -14 +14 @@
 
 my $q = CGI->new;
-my $config = OpenGuides::Config->new( file => "wiki.conf" );
+my $config_file = $ENV{OPENGUIDES_CONFIG_FILE} || "wiki.conf";
+my $config = OpenGuides::Config->new( file => $config_file );
 my $wiki = OpenGuides::Utils->make_wiki_object( config => $config );
 

trunk/preferences.cgi

@@ -10 +10 @@
 use OpenGuides::Template;
 
-my $config = OpenGuides::Config->new( file => "wiki.conf" );
+my $config_file = $ENV{OPENGUIDES_CONFIG_FILE} || "wiki.conf";
+my $config = OpenGuides::Config->new( file => $config_file );
 my $wiki = OpenGuides::Utils->make_wiki_object( config => $config );
 my $cgi = CGI->new();

trunk/supersearch.cgi

@@ -8 +8 @@
 use OpenGuides::SuperSearch;
 
-my $config = OpenGuides::Config->new( file => "wiki.conf" );
+my $config_file = $ENV{OPENGUIDES_CONFIG_FILE} || "wiki.conf";
+my $config = OpenGuides::Config->new( file => $config_file );
 my $search = OpenGuides::SuperSearch->new( config => $config );
 my %vars = CGI::Vars();

trunk/wiki.cgi

@@ -21 +21 @@
 use URI::Escape;
 
-my $config = OpenGuides::Config->new( file => "wiki.conf" );
+my $config_file = $ENV{OPENGUIDES_CONFIG_FILE} || "wiki.conf";
+my $config = OpenGuides::Config->new( file => $config_file );
 
 my $script_name = $config->script_name;