[pLog-svn] r6984 - plog/trunk/config
jondaley at devel.lifetype.net
jondaley at devel.lifetype.net
Wed Feb 17 15:49:05 EST 2010
Author: jondaley
Date: 2010-02-17 15:49:05 -0500 (Wed, 17 Feb 2010)
New Revision: 6984
Added:
plog/trunk/config/cache.properties.default
plog/trunk/config/config.properties.default
plog/trunk/config/logging.properties.default
plog/trunk/config/userdata.properties.default
Removed:
plog/trunk/config/cache.properties.php
plog/trunk/config/config.properties.php
plog/trunk/config/logging.properties.php
plog/trunk/config/userdata.properties.php
Log:
let's move these to their own files, so we can stop having to think about them when checking in from a svn/live version
Copied: plog/trunk/config/cache.properties.default (from rev 6982, plog/trunk/config/cache.properties.php)
===================================================================
--- plog/trunk/config/cache.properties.default (rev 0)
+++ plog/trunk/config/cache.properties.default 2010-02-17 20:49:05 UTC (rev 6984)
@@ -0,0 +1,29 @@
+<?php
+#
+# Settings for the data cache. If you're unsure what this means,
+# do not modify these settings. If you are planning to use
+# memcached as your cache system, please take a look below.
+#
+
+$config["cache_method"] = "cache_lite";
+
+#
+# cache settings for Cache_Lite
+#
+$config["cache_lite_cache_dir"] = "./tmp/";
+$config["cache_lite_life_time"] = 604800;
+$config["cache_lite_read_control"] = false;
+$config["cache_lite_automatic_serialization"] = true;
+$config["cache_lite_hashed_directory_level"] = 2;
+$config["cache_lite_filename_protection"] = true;
+
+#
+# cache settings for Memcached
+#
+$config["memcached_servers"] = array( "127.0.0.1:11211" );
+$config["memcached_life_time"] = 604800;
+$config["memcached_debug"] = false;
+$config["memcached_compress_threshold"] = 10240;
+$config["memcached_persistant"] = true;
+
+?>
\ No newline at end of file
Property changes on: plog/trunk/config/cache.properties.default
___________________________________________________________________
Added: svn:mergeinfo
+
Deleted: plog/trunk/config/cache.properties.php
===================================================================
--- plog/trunk/config/cache.properties.php 2010-02-17 20:47:47 UTC (rev 6983)
+++ plog/trunk/config/cache.properties.php 2010-02-17 20:49:05 UTC (rev 6984)
@@ -1,29 +0,0 @@
-<?php
-#
-# Settings for the data cache. If you're unsure what this means,
-# do not modify these settings. If you are planning to use
-# memcached as your cache system, please take a look below.
-#
-
-$config["cache_method"] = "cache_lite";
-
-#
-# cache settings for Cache_Lite
-#
-$config["cache_lite_cache_dir"] = "./tmp/";
-$config["cache_lite_life_time"] = 604800;
-$config["cache_lite_read_control"] = false;
-$config["cache_lite_automatic_serialization"] = true;
-$config["cache_lite_hashed_directory_level"] = 2;
-$config["cache_lite_filename_protection"] = true;
-
-#
-# cache settings for Memcached
-#
-$config["memcached_servers"] = array( "127.0.0.1:11211" );
-$config["memcached_life_time"] = 604800;
-$config["memcached_debug"] = false;
-$config["memcached_compress_threshold"] = 10240;
-$config["memcached_persistant"] = true;
-
-?>
\ No newline at end of file
Copied: plog/trunk/config/config.properties.default (from rev 6982, plog/trunk/config/config.properties.php)
===================================================================
--- plog/trunk/config/config.properties.default (rev 0)
+++ plog/trunk/config/config.properties.default 2010-02-17 20:49:05 UTC (rev 6984)
@@ -0,0 +1,54 @@
+<?php
+#
+# database settings
+#
+# Installation instructions:
+# NEW INSTALL
+# Leave these values blank,
+# and go to the URL where you installed LifeType
+# and look at /wizard.php and type the appropriate
+# values in there.
+#
+# This file needs to be writable
+# by whatever user your php scripts run as.
+# The easiest thing to do is to make this file
+# writable by everyone, and then after the wizard
+# completes, remove write privileges from everyone
+# except yourself.
+#
+# UPGRADE
+# remove all files from your old plog directory
+# (back them up somewhere, also backup your current
+# database)
+# Upload new pLog files into the same directory,
+# and then copy your old config.properties.php
+# over this file, and then run the wizard.
+# (note, if upgrading between minor releases:
+# 1.0 to 1.0.1, etc. you shouldn't run the wizard)
+
+$config['db_host'] = '';
+$config['db_username'] = '';
+$config['db_password'] = '';
+$config['db_database'] = '';
+$config['db_driver'] = '';
+$config["db_persistent"] = false;
+$config['db_character_set'] = '';
+
+#
+# the database prefix will be appended to the name of each database tables in case you want
+# to have more than one version of plog running at the same time, such as the stable and
+# unstable one for testing. Each one could use a different prefix and therefore they could
+# coexist in the same unique database. If you change this after the initial configuration done
+# with the installation wizard, please make sure that you also rename the tables.
+#
+$config['db_prefix'] = '';
+
+#
+# This array is used to pass driver-specific parameters. Currently the only supported
+# one is enable_fulltext_search, that informs the MySQL driver that FULLTEXT indexes
+# can be used to speed up searches. It's disabled by default as it does not work with
+# languages such as Chinese or Japanese. In all other cases, you probably want to enable
+# this for performance reasons (searches are lot faster if using the FULLTEXT indexes)
+#
+$config["db_options"] = Array( "enable_mysql_fulltext_search" => false );
+?>
\ No newline at end of file
Property changes on: plog/trunk/config/config.properties.default
___________________________________________________________________
Added: svn:mergeinfo
+
Deleted: plog/trunk/config/config.properties.php
===================================================================
--- plog/trunk/config/config.properties.php 2010-02-17 20:47:47 UTC (rev 6983)
+++ plog/trunk/config/config.properties.php 2010-02-17 20:49:05 UTC (rev 6984)
@@ -1,54 +0,0 @@
-<?php
-#
-# database settings
-#
-# Installation instructions:
-# NEW INSTALL
-# Leave these values blank,
-# and go to the URL where you installed LifeType
-# and look at /wizard.php and type the appropriate
-# values in there.
-#
-# This file needs to be writable
-# by whatever user your php scripts run as.
-# The easiest thing to do is to make this file
-# writable by everyone, and then after the wizard
-# completes, remove write privileges from everyone
-# except yourself.
-#
-# UPGRADE
-# remove all files from your old plog directory
-# (back them up somewhere, also backup your current
-# database)
-# Upload new pLog files into the same directory,
-# and then copy your old config.properties.php
-# over this file, and then run the wizard.
-# (note, if upgrading between minor releases:
-# 1.0 to 1.0.1, etc. you shouldn't run the wizard)
-
-$config['db_host'] = '';
-$config['db_username'] = '';
-$config['db_password'] = '';
-$config['db_database'] = '';
-$config['db_driver'] = '';
-$config["db_persistent"] = false;
-$config['db_character_set'] = '';
-
-#
-# the database prefix will be appended to the name of each database tables in case you want
-# to have more than one version of plog running at the same time, such as the stable and
-# unstable one for testing. Each one could use a different prefix and therefore they could
-# coexist in the same unique database. If you change this after the initial configuration done
-# with the installation wizard, please make sure that you also rename the tables.
-#
-$config['db_prefix'] = '';
-
-#
-# This array is used to pass driver-specific parameters. Currently the only supported
-# one is enable_fulltext_search, that informs the MySQL driver that FULLTEXT indexes
-# can be used to speed up searches. It's disabled by default as it does not work with
-# languages such as Chinese or Japanese. In all other cases, you probably want to enable
-# this for performance reasons (searches are lot faster if using the FULLTEXT indexes)
-#
-$config["db_options"] = Array( "enable_mysql_fulltext_search" => false );
-?>
\ No newline at end of file
Copied: plog/trunk/config/logging.properties.default (from rev 6982, plog/trunk/config/logging.properties.php)
===================================================================
--- plog/trunk/config/logging.properties.default (rev 0)
+++ plog/trunk/config/logging.properties.default 2010-02-17 20:49:05 UTC (rev 6984)
@@ -0,0 +1,68 @@
+<?php
+#
+# configuration for the default logger. If it is generating
+# too much logs for your tatest, set "appender" to "null". This will
+# be disabled once the final version is out anyway...
+#
+
+$config["default"] = Array(
+ "layout" => "%d %N - [%f:%l (%c:%F)] %m%n",
+ "appender" => "file",
+ "file" => PLOG_CLASS_PATH."tmp/lifetype.log",
+ "prio" => "debug"
+ );
+
+// debug output sent to debug.log by default.
+
+$config["debug"] = Array(
+ "layout" => "%t%n%d %N - [%f:%l (%c:%F)] %m%n",
+ "appender" => "null",
+ "file" => PLOG_CLASS_PATH."tmp/debug.log",
+ "prio" => "info"
+ );
+#
+# this logger is the only one enabled by default
+# and it will log all sql queries that generate an error
+# to the file tmp/sql_error.log
+#
+$config["sqlerr"] = Array(
+ "layout" => "%S%n %d %N - %m%n",
+ "appender" => "file",
+ "file" => PLOG_CLASS_PATH."tmp/sql_error.log",
+ "prio" => "error"
+ );
+
+#
+# special logger for the trackback.php script, it sends the data to
+# tmp/trackback.log
+#
+$config["trackback"] = Array(
+ "layout" => "%d %N - [%f:%l (%c:%F)] %m%n",
+ "appender" => "null",
+ "file" => PLOG_CLASS_PATH."tmp/trackback.log",
+ "prio" => "debug"
+ );
+
+#
+# special logger for metrics and performance statistics. This file is a CSV file and the
+# columns have the following meaning:
+#
+# timestamp (14-digit)
+# memory usage
+# total execution time
+# number of included files
+# number of SQL queries executed
+# total number of cache queries
+# total number of cache hits
+# total number of cache misses
+# script being executed
+# URL being processed
+#
+$config["metricslog"] = Array(
+ "layout" => "%m%n",
+ "appender" => "file",
+ "file" => PLOG_CLASS_PATH."tmp/metrics.log",
+ "prio" => "debug"
+ );
+
+?>
Property changes on: plog/trunk/config/logging.properties.default
___________________________________________________________________
Added: svn:mergeinfo
+
Deleted: plog/trunk/config/logging.properties.php
===================================================================
--- plog/trunk/config/logging.properties.php 2010-02-17 20:47:47 UTC (rev 6983)
+++ plog/trunk/config/logging.properties.php 2010-02-17 20:49:05 UTC (rev 6984)
@@ -1,68 +0,0 @@
-<?php
-#
-# configuration for the default logger. If it is generating
-# too much logs for your tatest, set "appender" to "null". This will
-# be disabled once the final version is out anyway...
-#
-
-$config["default"] = Array(
- "layout" => "%d %N - [%f:%l (%c:%F)] %m%n",
- "appender" => "file",
- "file" => PLOG_CLASS_PATH."tmp/lifetype.log",
- "prio" => "debug"
- );
-
-// debug output sent to debug.log by default.
-
-$config["debug"] = Array(
- "layout" => "%t%n%d %N - [%f:%l (%c:%F)] %m%n",
- "appender" => "null",
- "file" => PLOG_CLASS_PATH."tmp/debug.log",
- "prio" => "info"
- );
-#
-# this logger is the only one enabled by default
-# and it will log all sql queries that generate an error
-# to the file tmp/sql_error.log
-#
-$config["sqlerr"] = Array(
- "layout" => "%S%n %d %N - %m%n",
- "appender" => "file",
- "file" => PLOG_CLASS_PATH."tmp/sql_error.log",
- "prio" => "error"
- );
-
-#
-# special logger for the trackback.php script, it sends the data to
-# tmp/trackback.log
-#
-$config["trackback"] = Array(
- "layout" => "%d %N - [%f:%l (%c:%F)] %m%n",
- "appender" => "null",
- "file" => PLOG_CLASS_PATH."tmp/trackback.log",
- "prio" => "debug"
- );
-
-#
-# special logger for metrics and performance statistics. This file is a CSV file and the
-# columns have the following meaning:
-#
-# timestamp (14-digit)
-# memory usage
-# total execution time
-# number of included files
-# number of SQL queries executed
-# total number of cache queries
-# total number of cache hits
-# total number of cache misses
-# script being executed
-# URL being processed
-#
-$config["metricslog"] = Array(
- "layout" => "%m%n",
- "appender" => "file",
- "file" => PLOG_CLASS_PATH."tmp/metrics.log",
- "prio" => "debug"
- );
-
-?>
Copied: plog/trunk/config/userdata.properties.default (from rev 6982, plog/trunk/config/userdata.properties.php)
===================================================================
--- plog/trunk/config/userdata.properties.default (rev 0)
+++ plog/trunk/config/userdata.properties.default 2010-02-17 20:49:05 UTC (rev 6984)
@@ -0,0 +1,120 @@
+<?php
+####
+# Please do not edit these configuration settings unless you have read
+# and fully understood the documentation for user data providers:
+# http://wiki.lifetype.net/index.php/User_data_providers
+####
+
+#
+# Default user data provider, LifeType's own one
+#
+$config = Array(
+ "provider" => "LifeTypeUserDataProvider",
+);
+
+#
+# PHPBB2 user data provider
+#
+/*$config = Array(
+ "provider" => "PhpBB2UserDataProvider",
+ "createBlogIfNotExisting" => true,
+ "database" => "phpbb2",
+ "user" => "root",
+ "password" => "",
+ "prefix" => "phpbb_"
+);*/
+
+#
+# Simple PostNuke user data provider
+#
+/*$config = Array(
+ // general
+ "provider" => "SimplePostNukeUserDataProvider",
+ "createBlogIfNotExisting" => true,
+
+ // PostNuke db connection
+ "host" => "localhost",
+ "database" => "postnuke76",
+ "user" => "root",
+ "password" => "",
+ "prefix" => "pn_",
+
+ // This string gets appended to the username and results
+ // in "Username's Weblog"
+ "blogtitle_postfix" => "'s Weblog"
+);*/
+
+#
+# VBB3 user data provider
+#
+/*$config = Array(
+ "provider" => "vbb3UserDataProvider",
+ "createBlogIfNotExisting" => false,
+ "database" => "bbs", //vbb database name
+ "user" => "bbs", //vbb data base user name
+ "password" => "", //vbb data base user password
+ "prefix" => "", //vbb data base prefix
+ "usesalt" => true, //use password salt or not , if vbb3 ,plz set to true
+ "allowgroup" => Array(2,5,6,7), //default set to 2,5,6,7
+ "denygroup" => Array(3,4), //default set to 3,4
+ "admingroup" => Array(6), //default set to 6
+ "adminuser" => Array(1) //default set to 1
+);*/
+
+#
+# WBB2 user data provider
+#
+/*$config = Array(
+ // general
+ "provider" => "WBBUserDataProvider",
+ "createBlogIfNotExisting" => true,
+
+ // WBB2 connection
+ "host" => "localhost", //database server default: localhost
+ "database" => "", //database name
+ "user" => "", //database user
+ "password" => "", //user-password
+ "prefix" => "bb1_", //wbb2-prefix default: bb1_
+ "admingroup" => Array('1','11','42'), //groupcombinationIDs for Admin default: 1,11,42
+ "blogtitle_postfix" => "'s Blog" // This string gets appended to the username in blogtitle: "Username's Blog"
+);
+*/
+
+#
+# JOOMLA user data provider
+#
+#
+# Please run the following SQL query in your LifeType database,
+# as it is required by the provider
+#
+# CREATE TABLE `lt_joomla_users` (
+# `id` int(10) unsigned NOT NULL auto_increment,
+# `joomla_id` int(10) unsigned NOT NULL,
+# `about` text,
+# `properties` text NOT NULL,
+# `resource_picture_id` int(10) NOT NULL default '0',
+# `blog_site_admin` int(10) NOT NULL default '0',
+# PRIMARY KEY (`id`),
+# UNIQUE KEY `joomla_id` (`joomla_id`)
+# ) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+/*
+$config = Array(
+ // general
+ "provider" => "JoomlaUserDataProvider",
+ "createBlogIfNotExisting" => true,
+
+ // Joomla db connection
+ "host" => "mysql_host",
+ "database" => "joomla_db",
+ "user" => "joomla_db_user",
+ "password" => "joomla_db_pass",
+ "prefix" => "jos_",
+ "useNewJoomlaAuth" => true, // This is needed for Joomla 1.0.13 and higher
+
+ // This string gets appended to the username and results
+ // in "Username's Weblog"
+ "blogtitle_postfix" => "'s Weblog"
+);
+*/
+
+?>
Property changes on: plog/trunk/config/userdata.properties.default
___________________________________________________________________
Added: svn:mergeinfo
+
Deleted: plog/trunk/config/userdata.properties.php
===================================================================
--- plog/trunk/config/userdata.properties.php 2010-02-17 20:47:47 UTC (rev 6983)
+++ plog/trunk/config/userdata.properties.php 2010-02-17 20:49:05 UTC (rev 6984)
@@ -1,120 +0,0 @@
-<?php
-####
-# Please do not edit these configuration settings unless you have read
-# and fully understood the documentation for user data providers:
-# http://wiki.lifetype.net/index.php/User_data_providers
-####
-
-#
-# Default user data provider, LifeType's own one
-#
-$config = Array(
- "provider" => "LifeTypeUserDataProvider",
-);
-
-#
-# PHPBB2 user data provider
-#
-/*$config = Array(
- "provider" => "PhpBB2UserDataProvider",
- "createBlogIfNotExisting" => true,
- "database" => "phpbb2",
- "user" => "root",
- "password" => "",
- "prefix" => "phpbb_"
-);*/
-
-#
-# Simple PostNuke user data provider
-#
-/*$config = Array(
- // general
- "provider" => "SimplePostNukeUserDataProvider",
- "createBlogIfNotExisting" => true,
-
- // PostNuke db connection
- "host" => "localhost",
- "database" => "postnuke76",
- "user" => "root",
- "password" => "",
- "prefix" => "pn_",
-
- // This string gets appended to the username and results
- // in "Username's Weblog"
- "blogtitle_postfix" => "'s Weblog"
-);*/
-
-#
-# VBB3 user data provider
-#
-/*$config = Array(
- "provider" => "vbb3UserDataProvider",
- "createBlogIfNotExisting" => false,
- "database" => "bbs", //vbb database name
- "user" => "bbs", //vbb data base user name
- "password" => "", //vbb data base user password
- "prefix" => "", //vbb data base prefix
- "usesalt" => true, //use password salt or not , if vbb3 ,plz set to true
- "allowgroup" => Array(2,5,6,7), //default set to 2,5,6,7
- "denygroup" => Array(3,4), //default set to 3,4
- "admingroup" => Array(6), //default set to 6
- "adminuser" => Array(1) //default set to 1
-);*/
-
-#
-# WBB2 user data provider
-#
-/*$config = Array(
- // general
- "provider" => "WBBUserDataProvider",
- "createBlogIfNotExisting" => true,
-
- // WBB2 connection
- "host" => "localhost", //database server default: localhost
- "database" => "", //database name
- "user" => "", //database user
- "password" => "", //user-password
- "prefix" => "bb1_", //wbb2-prefix default: bb1_
- "admingroup" => Array('1','11','42'), //groupcombinationIDs for Admin default: 1,11,42
- "blogtitle_postfix" => "'s Blog" // This string gets appended to the username in blogtitle: "Username's Blog"
-);
-*/
-
-#
-# JOOMLA user data provider
-#
-#
-# Please run the following SQL query in your LifeType database,
-# as it is required by the provider
-#
-# CREATE TABLE `lt_joomla_users` (
-# `id` int(10) unsigned NOT NULL auto_increment,
-# `joomla_id` int(10) unsigned NOT NULL,
-# `about` text,
-# `properties` text NOT NULL,
-# `resource_picture_id` int(10) NOT NULL default '0',
-# `blog_site_admin` int(10) NOT NULL default '0',
-# PRIMARY KEY (`id`),
-# UNIQUE KEY `joomla_id` (`joomla_id`)
-# ) ENGINE=MyISAM AUTO_INCREMENT=1 ;
-/*
-$config = Array(
- // general
- "provider" => "JoomlaUserDataProvider",
- "createBlogIfNotExisting" => true,
-
- // Joomla db connection
- "host" => "mysql_host",
- "database" => "joomla_db",
- "user" => "joomla_db_user",
- "password" => "joomla_db_pass",
- "prefix" => "jos_",
- "useNewJoomlaAuth" => true, // This is needed for Joomla 1.0.13 and higher
-
- // This string gets appended to the username and results
- // in "Username's Weblog"
- "blogtitle_postfix" => "'s Weblog"
-);
-*/
-
-?>
More information about the pLog-svn
mailing list