From owner-svn-src-user@FreeBSD.ORG Mon May 21 19:28:14 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 952D41065794;
Mon, 21 May 2012 19:28:14 +0000 (UTC) (envelope-from des@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 67C468FC16;
Mon, 21 May 2012 19:28:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4LJSENT069904;
Mon, 21 May 2012 19:28:14 GMT (envelope-from des@svn.freebsd.org)
Received: (from des@localhost)
by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4LJSDdn069900;
Mon, 21 May 2012 19:28:13 GMT (envelope-from des@svn.freebsd.org)
Message-Id: <201205211928.q4LJSDdn069900@svn.freebsd.org>
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Date: Mon, 21 May 2012 19:28:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r235735 - in user/des/fbce: . db lib/FBCE/Model
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 May 2012 19:28:14 -0000
Author: des
Date: Mon May 21 19:28:13 2012
New Revision: 235735
URL: http://svn.freebsd.org/changeset/base/235735
Log:
Move the database connection information to the configuration file.
Remove RCS id from lib/FBCE/Model/FBCE.pm, which should hereafter never
change except to reflect changes in Catalyst itself.
Modified:
user/des/fbce/db/update.sh (contents, props changed)
user/des/fbce/fbce.conf (contents, props changed)
user/des/fbce/lib/FBCE/Model/FBCE.pm (contents, props changed)
Modified: user/des/fbce/db/update.sh
==============================================================================
--- user/des/fbce/db/update.sh Mon May 21 19:04:56 2012 (r235734)
+++ user/des/fbce/db/update.sh Mon May 21 19:28:13 2012 (r235735)
@@ -1,8 +1,8 @@
#!/bin/sh
+#
+# $FreeBSD$
+#
cd $(dirname $(realpath $0))
-../script/fbce_create.pl model \
- FBCE DBIC::Schema FBCE::Schema \
- create=static \
- "dbi:Pg:dbname=fbce" fbce
+../script/fbce_create.pl model FBCE DBIC::Schema FBCE::Schema
Modified: user/des/fbce/fbce.conf
==============================================================================
--- user/des/fbce/fbce.conf Mon May 21 19:04:56 2012 (r235734)
+++ user/des/fbce/fbce.conf Mon May 21 19:28:13 2012 (r235735)
@@ -1,5 +1,15 @@
+# $FreeBSD$
+
title = 2012 FreeBSD Core Team Election
+<Model::FBCE>
+ <connect_info>
+ dsn = "dbi:Pg:dbname=dbname"
+ user = "user"
+ password = "password"
+ </connect_info>
+</Model::FBCE>
+
<Model::Schedule>
nominating_starts = 2012-05-23 00:00:00 UTC
nominating_ends = 2012-05-30 00:00:00 UTC
Modified: user/des/fbce/lib/FBCE/Model/FBCE.pm
==============================================================================
--- user/des/fbce/lib/FBCE/Model/FBCE.pm Mon May 21 19:04:56 2012 (r235734)
+++ user/des/fbce/lib/FBCE/Model/FBCE.pm Mon May 21 19:28:13 2012 (r235735)
@@ -5,12 +5,6 @@ use base 'Catalyst::Model::DBIC::Schema'
__PACKAGE__->config(
schema_class => 'FBCE::Schema',
-
- connect_info => {
- dsn => 'dbi:Pg:dbname=fbce',
- user => 'fbce',
- password => '',
- }
);
=head1 NAME