Removed apache.conf as it was confusing folks. Updated config to not force secure connections. It's still highly recommended that you use secure connections, but sadly most folks aren't ready for that.

This commit is contained in:
Josh Sherman 2011-03-30 23:29:34 -04:00
parent a7addc1ab0
commit 43aff106a0
2 changed files with 3 additions and 15 deletions

View file

@ -1,12 +0,0 @@
# Sample Apache Virtual Host Entry
#
# The PHP include_path has to be updated to point to PICKLES. This can be done
# here, directly in the php.ini file, or simply set the include_path with
# ini_set() at the top of index.php (already done in the sample index.php)
<VirtualHost *>
ServerName yoursite.com
ServerAdmin your@email.com
DocumentRoot /path/to/your/site/public
# php_value include_path .:/path/to/pickles
</VirtualHost>

View file

@ -14,7 +14,7 @@ $config = array(
'error_reporting' => -1,
'date.timezone' => 'America/New_York',
),
// PICKLES configuration options
'pickles' => array(
// Disable with a "site down" message
@ -22,7 +22,7 @@ $config = array(
// Use sessions
'session' => true,
// Force HTTPS
'secure' => true,
'secure' => false,
// Name of the parent template
'template' => 'index',
// Name of the default module
@ -49,7 +49,7 @@ $config = array(
'database' => 'test'
),
),
// Security configuration
'security' => array(
// Login page