Merge remote-tracking branch 'origin/master' into fmb-read-only

Conflicts:
	.gitignore
	bin/make_css
	conf/general.yml-example
	perllib/FixMyStreet/App/Controller/Council.pm
	perllib/FixMyStreet/App/Controller/Report/New.pm
	perllib/FixMyStreet/Cobrand/Default.pm
	templates/web/default/around/around_index.html
	templates/web/default/index.html
	templates/web/emptyhomes/index.html
	templates/web/fixmystreet/around/around_index.html
	templates/web/fixmystreet/index.html
	web/fixmystreet_app_cgi.cgi
	web/fixmystreet_app_fastcgi.cgi

6 files changed, 0 insertions, 111 deletions

diff --git a/blog/conf/general-example b/blog/conf/general-example
deleted file mode 100644
index dca1e9dcc..000000000
--- a/blog/conf/general-example
+++ /dev/null
@@ -1,27 +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) 2005 UK Citizens Online Democracy. All rights reserved.
- * Email: francis@mysociety.org; WWW: http://www.mysociety.org
- *
- * $Id: general-example,v 1.2 2010-01-28 00:47:37 francis Exp $
- * 
- */
-
-// MySQL database for FMSBLOG mySociety WordPress
-define('OPTION_FMSBLOG_DB_NAME', '');
-define('OPTION_FMSBLOG_DB_USER', '');
-define('OPTION_FMSBLOG_DB_PASS', '');
-define('OPTION_FMSBLOG_DB_HOST', '');
-define('OPTION_STAGING', '0');
-
diff --git a/blog/conf/httpd.conf b/blog/conf/httpd.conf
deleted file mode 100644
index 2f93bc3cc..000000000
--- a/blog/conf/httpd.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# Apache configuration for code.fixmystreet.com.
-#
-# Copyright (c) 2012 UK Citizens Online Democracy. All rights reserved.
-# Email: struan@mysociety.org; WWW: http://www.mysociety.org
-
-<Location /fcgi>
-    Options +ExecCGI
-    SetHandler fastcgi-script
-</Location>
-
-RewriteEngine on
-#RewriteLog /var/log/apache2/rewrite.log
-#RewriteLogLevel 5
-
-# PHP files can be referred without PHP
-RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI}.php -f
-RewriteRule /(.+) /$1.php [PT]
-
diff --git a/blog/conf/wp-config.php b/blog/conf/wp-config.php
deleted file mode 100644
index 38599b326..000000000
--- a/blog/conf/wp-config.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/** WordPress's config file **/
-/** http://wordpress.org/   **/
-
-// ** MySQL settings ** //
-if (!@include "../conf/general") {
-    if (!@include "../../conf/general") {
-        if (!@include "../../../conf/general") {
-            if (!@include(dirname(__FILE__) . "../../../conf/general")) {
-                print "Error including conf/general in wp-config.php on code.fixmystreet.com WordPress";
-                exit;
-            }
-        }
-    }
-}
-define('DB_NAME', OPTION_FMSBLOG_DB_NAME);     // The name of the database
-define('DB_USER', OPTION_FMSBLOG_DB_USER);     // Your MySQL username
-define('DB_PASSWORD', OPTION_FMSBLOG_DB_PASS); // ...and password
-define('DB_HOST', OPTION_FMSBLOG_DB_HOST);     // 99% chance you won't need to change this value
-
-// Change the prefix if you want to have multiple blogs in a single database.
-
-$table_prefix  = 'wp_';   // example: 'wp_' or 'b2' or 'mylogin_'
-
-// Change this to localize WordPress.  A corresponding MO file for the
-// chosen language must be installed to wp-includes/languages.
-// For example, install de.mo to wp-includes/languages and set WPLANG to 'de'
-// to enable German language support.
-define ('WPLANG', '');
-
-$toppath = $_SERVER['DOCUMENT_ROOT']; 
-$trimmed = rtrim($toppath, "blog/web");
-define('TOP_PATH', $trimmed);
-
-/* Stop editing */
-
-$server = DB_HOST;
-$loginsql = DB_USER;
-$passsql = DB_PASSWORD;
-$base = DB_NAME;
-
-define('ABSPATH', dirname(__FILE__).'/');
-
-// Get everything else
-require_once(ABSPATH.'wp-settings.php');
-?>
diff --git a/blog/web/.htaccess b/blog/web/.htaccess
deleted file mode 100644
index 8d2ba9aa2..000000000
--- a/blog/web/.htaccess
+++ /dev/null
@@ -1,11 +0,0 @@
-
-# BEGIN WordPress
-<IfModule mod_rewrite.c>
-RewriteEngine On
-RewriteBase /
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteCond %{REQUEST_FILENAME} !-d
-RewriteRule . /index.php [L]
-</IfModule>
-
-# END WordPress
diff --git a/blog/web/fcgi/php-basic b/blog/web/fcgi/php-basic
deleted file mode 100755
index f3034d9e2..000000000
--- a/blog/web/fcgi/php-basic
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-PHP_FCGI_CHILDREN=1 PHPRC=/etc/php5/fcgi exec /usr/bin/php5-cgi
-
diff --git a/blog/web/index.php b/blog/web/index.php
deleted file mode 100644
index fbc0ef37f..000000000
--- a/blog/web/index.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php 
-
-# Copy of the lines from WP main index.php, so it can be in subdirectory
-define('WP_USE_THEMES', true);
-require('./wp/wp-blog-header.php');
-