Changeset 264

Timestamp:

11/01/03 22:20:19 (5 years ago)

Author:

kake

Message:

Junked OpenGuides::Config completely to avoid database password

leakage, and easier install (CPAN RT 3916).

Location:

trunk

Files:

• Build.PL (modified) (5 diffs)
• Changes (modified) (1 diff)
• INSTALL (modified) (3 diffs)
• PREREQUISITES (modified) (2 diffs)
• TROUBLESHOOTING (modified) (1 diff)

trunk/Build.PL

@@ -10 +10 @@
 
 # See if we already have some config variables set.
-use lib "lib";
-my %existing_config;
-eval "use OpenGuides::Config";
-%existing_config = %OpenGuides::Config::config unless $@;
+my $read_config = Config::Tiny->read('wiki.conf');
+my %existing_config = $read_config ? %{ $read_config->{_} } : ();
 
 my @questions = (
@@ -83 +81 @@
 );
 
+print <<EOF;
+
+Beginning install process... if you already have an OpenGuides
+configuration file and you don't want to have to type in all your config
+parameters over again, abort this process now, copy that file to this
+directory, and start again.
+
+EOF
+
+my $continue = Module::Build->y_n("Continue with install?", "y");
+exit 0 unless $continue;
+
 my $skip_config = Module::Build->y_n("Skip OpenGuides configuration?", "n");
 if ( $skip_config ) {
@@ -89 +99 @@
 Skipping OpenGuides configuration - any configuration options previously
 saved will be used instead.  You may tweak your configuration now by
-editing the 'wiki.conf' file produced by this script, but changes made to
-that file will *not* stick around for the next time you install OpenGuides.
+editing the 'wiki.conf' file produced by this script.
 ===========================================================================
 EOF
@@ -182 +191 @@
 }
 close FILE or die "Can't close wiki.conf: $!";
-
-# Now use Config::Tiny to read it all back in - bit convoluted I know.
-my $read_config = Config::Tiny->read('wiki.conf');
-%existing_config = %{ $read_config->{_} };
-
-# And pop it in OpenGuides::Config
-%OpenGuides::Config::config = %existing_config;
-open OUT, ">lib/OpenGuides/Config.pm"
-    or die "Can't open lib/OpenGuides/Config.pm for writing: $!";
-
-# Sigh, I am still cargo culting this line; one day I will figure out
-# how it works (Kake).
-print OUT Data::Dumper->new([ \%OpenGuides::Config::config ],
-                            [ '*OpenGuides::Config::config' ]
-                           )->Dump,
-    "\n1;\n";
 
 #####
@@ -240 +233 @@
 
 $build->add_to_cleanup( "wiki.conf" );
+$build->add_to_cleanup( "configlib" );
 
 # Tell OpenGuides::Build which additional scripts and templates to install.

trunk/Changes

@@ -1 @@
-0.28    
+0.28    1 November 2003
         Allow running sites on SQLite databases.
         Fixed bug with navbar prompt in Build.PL (CPAN RT #3894).
+        Junked OpenGuides::Config completely to avoid database password
+          leakage, and easier install (CPAN RT 3916).
 
 0.27    1 November 2003

trunk/INSTALL

@@ -10 +10 @@
 
 Unpack the distribution (using for example 'tar' or 'WinZip'), and set
-your working directory to be the top level of the distribution, then
-execute the following commands:
+your working directory to be the top level of the distribution.
+
+If you have an existing "wiki.conf" configuration file and you wish
+to keep using the values in that, copy it to this directory.
+
+Now execute the following commands:
 
 perl Build.PL
@@ -28 +32 @@
 
 
-  "what type of database do you want the site to run on?  postgres/mysql"
+  "what type of database do you want the site to run on?"
 
-Answer either "postgres" or "mysql".
+Answer "postgres", "mysql", or "sqlite".
 
 
@@ -37 +41 @@
   "And the password that they use to access the database?"
 
-You should create (or ask your ISP/sysadmin to create) a Postgres or
-MySQL database specifically for the use of OpenGuides.  If you have
-more than one OpenGuides installation, for example if you run guides
-for more than one city, each installation will need its own database.
-(TODO - support SQLite as well (requires faffing with install scripts,
-bit messy but CGI::Wiki already supports this so won't be hard))
+You should create (or ask your ISP/sysadmin to create) a database
+specifically for the use of OpenGuides.  If you have more than one
+OpenGuides installation, for example if you run guides for more than
+one city, each installation will need its own database.
 
 

trunk/PREREQUISITES

@@ -1 @@
-Modules required by OpenGuides 0.27
+Modules required by OpenGuides 0.28
 ===================================
 
@@ -18 +18 @@
     -- or --
   DBD::mysql
+    -- or --
+  DBD::SQLite
 )
 File::Spec::Functions

trunk/TROUBLESHOOTING

@@ -45 +45 @@
 
 ----------------------------------------------------------------------
+
+Again relating to permissions - if you are using SQLite then note that
+the user your CGI is running as must have write access to not only the
+database file itself, but the directory that the file is in (in order
+that it can write a lockfile).
+
+----------------------------------------------------------------------