4 files changed, 63 insertions, 77 deletions
diff --git a/conf/.gitignore b/conf/.gitignore
index 0a78c8825..f0c34fd29 100644
--- a/conf/.gitignore
+++ b/conf/.gitignore
@@ -1,4 +1,4 @@
-/general
-/general.deployed
+/general.yml
+/general.yml.deployed
 /httpd.conf
 /httpd.conf.deployed
diff --git a/conf/general-example b/conf/general-example
deleted file mode 100644
index 65e192b4d..000000000
--- a/conf/general-example
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/*
- * general-example:
- * Example values for the "general" config file.
- *
- * Configuration parameters, in PHP syntax. Configuration parameters are set
- * using the PHP define('OPTION_...', '...') function. Both perl and PHP code
- * parse this properly, so you can use comments and conditionals and whatnot,
- * but unless essential it's better to keep it simple....
- *
- * Copy this file to one called "general" in the same directory.  Or
- * have multiple config files and use a symlink to change between them.
- * 
- * Copyright (c) 2006 UK Citizens Online Democracy. All rights reserved.
- * Email: francis@mysociety.org; WWW: http://www.mysociety.org
- *
- * $Id: general-example,v 1.23 2010-01-06 14:59:34 louise Exp $
- * 
- */
-
-// PostgreSQL database for BCI
-define('OPTION_BCI_DB_HOST', 'localhost');
-define('OPTION_BCI_DB_PORT', '5432');
-define('OPTION_BCI_DB_NAME', 'bci');
-define('OPTION_BCI_DB_USER', 'bci');
-define('OPTION_BCI_DB_PASS', '');
-
-define('OPTION_BASE_URL', 'http://www.example.org');
-
-define('OPTION_EMAIL_DOMAIN', 'example.org');
-define('OPTION_CONTACT_EMAIL', 'team@'.OPTION_EMAIL_DOMAIN);
-define('OPTION_TEST_EMAIL_PREFIX', null);
-
-define('OPTION_CONTACT_NAME', 'FixMyStreet');
-define('OPTION_STAGING_SITE', 1);
-
-define('OPTION_UPLOAD_CACHE', '/upload/');
-define('OPTION_GEO_CACHE', '/cache/');
-define('OPTION_GOOGLE_MAPS_API_KEY', '');
-define('OPTION_BING_MAPS_API_KEY', '');
-
-define('OPTION_LONDON_REPORTIT_URL', '');
-define('OPTION_LONDON_REPORTIT_KEY', '');
-define('OPTION_LONDON_REPORTIT_SECRET', '');
-
-define('OPTION_MAPIT_URL', 'http://mapit.mysociety.org/');
-define('OPTION_MAP_TYPE', 'OSM');
-define('OPTION_EVEL_URL', 'http://services.mysociety.org/evel');
-define('OPTION_GAZE_URL', 'http://gaze.mysociety.org/gaze');
-
-// Tracking
-define('OPTION_TRACKING', 0);   // off by default
-define('OPTION_TRACKING_URL', 'http://path/to/web/bug');
-define('OPTION_TRACKING_SECRET', 'really-secret-value');
-
-define('OPTION_AUTH_SHARED_SECRET', '');
-define('OPTION_HEARFROMYOURMP_BASE_URL', '');
-
-define('OPTION_SMTP_SMARTHOST', 'localhost');
-
-define('OPTION_IPHONE_URL', '');
-
-// Log file (used in test harness, and later in admin scripts)
-define('OPTION_HTTPD_ERROR_LOG', '/var/log/apache/error.log');
-
-define('OPTION_ALLOWED_COBRANDS', 'cobrand_one|cobrand_two');
-
-// How many items are returned in the GeoRSS feeds by default
-define('OPTION_RSS_LIMIT', '20');
-
-// Should problem reports link to the council summary pages?
-define('OPTION_AREA_LINKS_FROM_PROBLEMS', '0');
-
-?>
diff --git a/conf/general.yml-example b/conf/general.yml-example
new file mode 100644
index 000000000..efdb5d007
--- /dev/null
+++ b/conf/general.yml-example
@@ -0,0 +1,60 @@
+# general-example.yml:
+# Example values for the "general" config file.
+#
+# Configuration parameters, in YAML syntax.
+#
+# Copy this file to one called "general.yml" in the same directory.  Or
+# have multiple config files and use a symlink to change between them.
+
+# PostgreSQL database for FMS
+FMS_DB_HOST: 'localhost'
+FMS_DB_PORT: '5432'
+FMS_DB_NAME: 'fms'
+FMS_DB_USER: 'fms'
+FMS_DB_PASS: ''
+
+BASE_URL: 'http://www.example.org'
+
+EMAIL_DOMAIN: 'example.org'
+CONTACT_EMAIL: 'team@example.org'
+TEST_EMAIL_PREFIX: ''
+
+CONTACT_NAME: 'FixMyStreet'
+STAGING_SITE: 1
+
+UPLOAD_CACHE: '/upload/'
+GEO_CACHE: '/cache/'
+GOOGLE_MAPS_API_KEY: ''
+BING_MAPS_API_KEY: ''
+
+LONDON_REPORTIT_URL: ''
+LONDON_REPORTIT_KEY: ''
+LONDON_REPORTIT_SECRET: ''
+
+MAPIT_URL: 'http://mapit.mysociety.org/'
+MAP_TYPE: 'OSM'
+EVEL_URL: 'http://services.mysociety.org/evel'
+GAZE_URL: 'http://gaze.mysociety.org/gaze'
+
+# Tracking
+TRACKING: 0   # off by default
+TRACKING_URL: 'http://path/to/web/bug'
+TRACKING_SECRET: 'really-secret-value'
+
+AUTH_SHARED_SECRET: ''
+HEARFROMYOURMP_BASE_URL: ''
+
+SMTP_SMARTHOST: 'localhost'
+
+IPHONE_URL: ''
+
+# Log file (used in test harness, and later in admin scripts)
+HTTPD_ERROR_LOG: '/var/log/apache/error.log'
+
+ALLOWED_COBRANDS: 'cobrand_one|cobrand_two'
+
+# How many items are returned in the GeoRSS feeds by default
+RSS_LIMIT: '20'
+
+# Should problem reports link to the council summary pages?
+AREA_LINKS_FROM_PROBLEMS: '0'
diff --git a/conf/packages b/conf/packages
index 5fa3cf77e..7e383d7b9 100644
--- a/conf/packages
+++ b/conf/packages
@@ -34,4 +34,4 @@ libyaml-perl
 liblist-moreutils-perl
 libhaml-ruby
 libtemplate-perl
-postgresql-server-dev-8.3
+postgresql-server-dev-8.4