diff -up MojoMojo-1.00/mojomojo.conf.orig MojoMojo-1.00/mojomojo.conf --- MojoMojo-1.00/mojomojo.conf.orig 2010-05-12 00:57:27.000000000 +0200 +++ MojoMojo-1.00/mojomojo.conf 2010-05-21 06:01:32.000000000 +0200 @@ -32,7 +32,7 @@ system_mail Default Installation <norepl password db_password # SQLite dsn (default data store) - dsn dbi:SQLite:mojomojo.db + dsn dbi:SQLite:/var/lib/mojomojo/mojomojo.db # Enable unicode for supported databases sqlite_unicode 1 @@ -42,10 +42,10 @@ system_mail Default Installation <norepl </connect_info> </Model::DBIC> -root __path_to(root)__ -static_path /.static/ -attachment_dir __path_to(uploads)__ -index_dir __path_to(index)__ +root /usr/share/mojomojo/root +static_path /mojomojo/static/ +attachment_dir /var/lib/mojomojo/uploads +index_dir /var/lib/mojomojo/index <session> expires 604800 diff -up MojoMojo-1.00/script/mojomojo_cgi.pl.orig MojoMojo-1.00/script/mojomojo_cgi.pl --- MojoMojo-1.00/script/mojomojo_cgi.pl.orig 2010-05-08 19:13:32.000000000 +0200 +++ MojoMojo-1.00/script/mojomojo_cgi.pl 2010-05-21 06:01:32.000000000 +0200 @@ -1,6 +1,9 @@ #!/usr/bin/env perl -BEGIN { $ENV{CATALYST_ENGINE} ||= 'CGI' } +BEGIN { + $ENV{MOJOMOJO_HOME} ||= '/var/lib/mojomojo'; + $ENV{CATALYST_ENGINE} ||= 'CGI'; +} use strict; use warnings; diff -up MojoMojo-1.00/script/mojomojo_fastcgi.pl.orig MojoMojo-1.00/script/mojomojo_fastcgi.pl --- MojoMojo-1.00/script/mojomojo_fastcgi.pl.orig 2010-05-08 19:13:32.000000000 +0200 +++ MojoMojo-1.00/script/mojomojo_fastcgi.pl 2010-05-21 06:01:32.000000000 +0200 @@ -1,6 +1,9 @@ #!/usr/bin/env perl -BEGIN { $ENV{CATALYST_ENGINE} ||= 'FastCGI' } +BEGIN { + $ENV{MOJOMOJO_HOME} ||= '/var/lib/mojomojo'; + $ENV{CATALYST_ENGINE} ||= 'FastCGI'; +} use strict; use warnings; diff -up MojoMojo-1.00/script/mojomojo_server.pl.orig MojoMojo-1.00/script/mojomojo_server.pl --- MojoMojo-1.00/script/mojomojo_server.pl.orig 2010-05-08 19:13:32.000000000 +0200 +++ MojoMojo-1.00/script/mojomojo_server.pl 2010-05-21 06:01:32.000000000 +0200 @@ -1,6 +1,7 @@ #!/usr/bin/env perl BEGIN { + $ENV{MOJOMOJO_HOME} ||= '/var/lib/mojomojo'; $ENV{CATALYST_ENGINE} ||= 'HTTP'; $ENV{CATALYST_SCRIPT_GEN} = 39; require Catalyst::Engine::HTTP; diff -up MojoMojo-1.00/script/mojomojo_spawn_db.pl.orig MojoMojo-1.00/script/mojomojo_spawn_db.pl --- MojoMojo-1.00/script/mojomojo_spawn_db.pl.orig 2010-05-09 21:16:51.000000000 +0200 +++ MojoMojo-1.00/script/mojomojo_spawn_db.pl 2010-05-21 06:02:27.000000000 +0200 @@ -14,7 +14,10 @@ Jonathan Rockway <jrockway@cpan.org> =cut -BEGIN { $ENV{CATALYST_DEBUG} = 0 } +BEGIN { + $ENV{MOJOMOJO_HOME} ||= '/var/lib/mojomojo'; + $ENV{CATALYST_DEBUG} = 0; +} use strict; use warnings; use FindBin '$Bin'; @@ -103,7 +106,7 @@ eval { }; if ($@) { die "Your DSN line in mojomojo.conf doesn't look like a valid DSN." - . " Add one, or pass it on the command line."; + . " Add one, or pass it on the command line. " . $@; } die "No valid Data Source Name (DSN).\n" if !$dsn; $dsn =~ s/__HOME__/$FindBin::Bin\/\.\./g;