Changeset 25

Timestamp:

11/23/10 16:22:22 (13 years ago)

Author:

nanardon

Message:

• add default config file

Location:

server/trunk/web

Files:

• Makefile.PL (modified) (3 diffs)
• Sophie.spec.in (modified) (3 diffs)
• lib/Sophie/Base.pm (modified) (1 diff)
• sophie.conf.in (added)

server/trunk/web/Makefile.PL

@@ -9 +9 @@
 name 'Sophie';
 all_from 'lib/Sophie.pm';
+
+requires 'DBD::Pg';
+requires 'DBIx::Class';
 
 requires 'Catalyst::Runtime' => '5.80025';
@@ -22 +25 @@
 requires 'Catalyst::Plugin::Prototype' => '0';
 requires 'Catalyst::View::TT' => '0';
-requires 'DBD::Pg';
+requires 'Catalyst::Plugin::Compress::Zlib';
+requires 'Catalyst::Plugin::Server';
+requires 'Catalyst::Plugin::Server::XMLRPC';
 requires 'Config::General'; # This should reflect the config file format you've chosen
                  # See Catalyst::Plugin::ConfigLoader for supported formats
@@ -37 +42 @@
 
 package MY;
+
+sub install {
+    my ($self) = @_;
+    my $section = $self->SUPER::install();
+
+    $section =~ s/(^install ::.*)/$1 install_config/m;
+
+    $section .= qq[
+install_config: sophie.conf.in
+\tinstall -d \$(DESTDIR)/etc
+\tinstall -d \$(DESTDIR)/etc/sophie
+\tinstall sophie.conf.in \$(DESTDIR)/etc/sophie/sophie.conf
+
+    ];
+
+    $section
+}
 
 sub postamble {

server/trunk/web/Sophie.spec.in

@@ -25 +25 @@
 BuildRequires: perl(Catalyst::Plugin::Prototype)
 BuildRequires: perl(Catalyst::View::TT)
+BuildRequires: perl(DBIx::Class)
+BuildRequires: perl(Catalyst::Plugin::Compress::Zlib)
+BuildRequires: perl-Catalyst-Plugin-Server
 
 Requires: perl(Catalyst)
@@ -36 +39 @@
 Requires: perl(Catalyst::Plugin::Prototype)
 Requires: perl(Catalyst::View::TT)
+Requires: perl(Catalyst::Plugin::Compress::Zlib)
+Requires: perl-Catalyst-Plugin-Server
 # Requires: apache-mod_fastcgi
 # Requires: perl(FCGI)
@@ -60 +65 @@
 %defattr(-,root,root)
 %doc Changes README
+%dir %_sysconfdir/sophie
+%config(noreplace) %_sysconfdir/sophie/*
 %_bindir/*
 %{_mandir}/man3/*

server/trunk/web/lib/Sophie/Base.pm

@@ -20 +20 @@
    require Config::General;
    my $config;
-   foreach my $file ('sophie.conf', "$Bin/../sophie.conf") {
+   foreach my $file ('sophie.conf', "$Bin/../sophie.conf",
+       '/etc/sophie/sophie.conf') {
        -f $file or next;
         my $cg = Config::General->new($file);