[pLog-svn] r4685 - in plog/branches/lifetype-1.2: bin-devel release
oscar at devel.lifetype.net
oscar at devel.lifetype.net
Sat Feb 3 08:00:46 EST 2007
Author: oscar
Date: 2007-02-03 08:00:46 -0500 (Sat, 03 Feb 2007)
New Revision: 4685
Added:
plog/branches/lifetype-1.2/release/cache.properties.php.dist
plog/branches/lifetype-1.2/release/userdata.properties.php.dist
Removed:
plog/branches/lifetype-1.2/release/config.properties.php.release-0.1.dist
plog/branches/lifetype-1.2/release/dist.sh
Modified:
plog/branches/lifetype-1.2/bin-devel/build-svn.sh
plog/branches/lifetype-1.2/release/logging.properties.php.dist
Log:
Added generic config files for the cache, the user provider and logging so that our development ones do not get included in official builds
Modified: plog/branches/lifetype-1.2/bin-devel/build-svn.sh
===================================================================
--- plog/branches/lifetype-1.2/bin-devel/build-svn.sh 2007-02-03 12:49:32 UTC (rev 4684)
+++ plog/branches/lifetype-1.2/bin-devel/build-svn.sh 2007-02-03 13:00:46 UTC (rev 4685)
@@ -110,6 +110,9 @@
# copy the generic config file and remove the dist/ folder since it is not needed
message "Copying the generic config.properties.file..."
cp -f $WORKDIR/release/config.properties.php.dist $WORKDIR/config/config.properties.php
+cp -f $WORKDIR/release/logging.properties.php.dist $WORKDIR/config/logging.properties.php
+cp -f $WORKDIR/release/cache.properties.php.dist $WORKDIR/config/cache.properties.php
+cp -f $WORKDIR/release/userdata.properties.php.dist $WORKDIR/config/userdata.properties.php
rm -rf $WORKDIR/dist
# finally, update the version.php file
Added: plog/branches/lifetype-1.2/release/cache.properties.php.dist
===================================================================
--- plog/branches/lifetype-1.2/release/cache.properties.php.dist (rev 0)
+++ plog/branches/lifetype-1.2/release/cache.properties.php.dist 2007-02-03 13:00:46 UTC (rev 4685)
@@ -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. The only two
+# possible values are cache_lite and memcached
+#
+
+$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;
+
+#
+# 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
Deleted: plog/branches/lifetype-1.2/release/config.properties.php.release-0.1.dist
===================================================================
--- plog/branches/lifetype-1.2/release/config.properties.php.release-0.1.dist 2007-02-03 12:49:32 UTC (rev 4684)
+++ plog/branches/lifetype-1.2/release/config.properties.php.release-0.1.dist 2007-02-03 13:00:46 UTC (rev 4685)
@@ -1,189 +0,0 @@
-<?php
-#
-# enables or disables comments
-#
-$config["comments_enabled"] = true;
-
-#
-# enables or disables the RDF feed
-#
-$config["rdf_enabled"] = true;
-
-#
-# temporary folder
-#
-$config["temp_folder"] = "./tmp";
-
-#
-# where is our page located
-# (note: so far only used by the RDF engine)
-#
-$config["journal_url"] = "http://your.host/your/url";
-
-#
-# database settings
-#
-$config["db_host"] = "your_db_host";
-$config["db_username"] = "your_db_user";
-$config["db_password"] = "your_db_password";
-$config["db_database"] = "your_database";
-#
-# 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"] = "plog_";
-
-#
-# enables or disables the search feature
-#
-$config["search_enabled"] = "true";
-
-#
-# how many posts we show in the main page
-# (note: using op=see_all will show all the posts)
-# it also affects how many posts will be included in the
-# RDF feed
-#
-$config["show_posts_max"] = "15";
-#
-# how many posts we show in the "recent" list
-#
-$config["recent_posts_max"] = "10";
-
-#
-# sets the default layout
-#
-$config["default_template"] = "grey";
-
-#
-# default folder where layouts can be found
-#
-$config["template_folder"] = "./templates";
-
-#
-# identifier from the database of the default blog we should
-# show if no parameter is specified
-#
-$config["default_blog_id"] = 1;
-
-#
-# default locale used to render the messages
-#
-$config["default_locale"] = "en_UK";
-
-#
-# determines which html tags are allowed in user comments (anything is allowed
-# in posts!!)
-#
-$config["html_allowed_tags_in_comments"] = "<a><i><br><br/><b>";
-
-#
-# enables or disables the referer tracker, so that we can collect some statistics
-# on who is linking to us and when
-#
-$config["referer_tracker_enabled"] = true;
-
-#
-# enables or disables globally the RSS parser used to import RSS/RDF sources
-#
-$config["rss_parser_enabled"] = true;
-
-#
-# determines wether to enable or not the "show more" link, used when an article
-# goes over the 'show_more_threshold' words
-#
-$config["show_more_enabled"] = true;
-
-#
-# after how many **words** we should show the "more..." link
-## NB: the unit is words, not characters!!!
-#
-$config["show_more_threshold"] = 50;
-
-#
-# wether we should keep count on how many times an article has been read or not
-# this of course requires an additional query to be performed on the database
-# every time
-#
-$config["update_article_reads"] = true;
-
-#
-# Enables or disables globally the email notification service.
-# This only controls the email sending service, which is then used in other places
-# of the blog. For example, the owner of a post can be notified every time there is
-# a new comment in a post.
-# This extension of course needs PHP to be built with the email functions and those
-# to be enabled. The smtp server and user used to send emails is configured by the
-# php.ini file and can therefore not be configured here. Please have a look at
-# http://www.php.net/manual/en/function.mail.php for more information.
-#
-$config["email_service_enabled"] = true;
-
-#
-# determines which address will appear in the From: field when the system
-# sends a notification email.
-#
-$config["post_notification_source_address"] = "newcomment at noreply.net";
-
-#
-# this setting controls how urls are generated inside the application
-# possible values are:
-# 1: urls are generated like any other normal http url, in the form of:
-# index.php?op=Default&blogId=2
-# 2: urls are generated in a 'search engine friendly' way:
-# index.php/op/Default/blogId/2
-# WARNING: support for type number '2' of urls is still a bit buggy... better
-# live with '1' for a while!!
-#
-$config["request_format_mode"] = 1;
-
-#
-# wether the xmlrpc ping to notify services like weblogs.com and blo.gs is enabled
-#
-$config["xmlrpc_ping_enabled"] = false;
-#
-# which sources we want to notify (must include the full url to the xmlrpc
-# interface they're providing!!!) We can add as many as we need to because this is an
-# array. Leave it just as Array() if no hosts are defined.
-#
-$config["xmlrpc_ping_hosts"] = Array( "http://rpc.weblogs.com/RPC2" );
-
-#
-# wether or not to enable the trackback feature in server mode. that is,
-# wether we should or not accept trackback ping requests.
-#
-$config["trackback_server_enabled"] = true;
-
-#
-# wether to enable or not the htmlarea feature, that allows WYSISWYG edition
-# of textarea fields. It is very handy so by default it is enabled.
-#
-$config["htmlarea_enabled"] = true;
-
-#
-# wether to enable or not the plugin manager
-#
-$config["plugin_manager_enabled"] = true;
-
-#
-# if set to true, the EmailValidator class will do first a basic check on the sintax
-# of the email address and then will proceed to do some MX record checkings and
-# then check if the email address is a valid one doing some interaction with the
-# smtp server. It is recommended to leave this turned on if we are running a
-# site with an open registration process. Email validations are carried everywhere
-# an email address is required, for example when updating the users's own email
-# address in the 'user profile' part.
-# Please set this to 'false' if you are running plog for your own personal use
-# and/or your php installation does not have the networking functions enabled.
-#
-$config["check_email_address_validity"] = false;
-
-#
-# how many posts we would like to show in the summary page. This feature
-# needs the summary.php file available.
-#
-$config["summary_page_show_max"] = 15;
-?>
Deleted: plog/branches/lifetype-1.2/release/dist.sh
===================================================================
--- plog/branches/lifetype-1.2/release/dist.sh 2007-02-03 12:49:32 UTC (rev 4684)
+++ plog/branches/lifetype-1.2/release/dist.sh 2007-02-03 13:00:46 UTC (rev 4685)
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-files=`cat include_files`
-timestamp=`date +%Y%m%d`
-destdir="plog-devel-$timestamp"
-
-if [ "$1" == "iwebland" ]; then
- destdir=$destdir"-iwebland"
-fi
-
-echo "Creating distribution folder..."
-mkdir $destdir
-
-echo "Creating version...";
-echo "<?php" > version.php
-echo "\$version = $timestamp;" >> version.php
-echo "?>" >> version.php
-
-for file in $files
-do
- echo Adding: $file
- cp -rf $file $destdir
-done
-
-
-echo "Copying configuration files..."
-cp dist/config.properties.php.dist $destdir/config/config.properties.php
-
-echo "Creating temp folder...";
-mkdir $destdir/tmp
-chmod 757 $destdir/tmp
-
-echo "** Process complete **"
Modified: plog/branches/lifetype-1.2/release/logging.properties.php.dist
===================================================================
--- plog/branches/lifetype-1.2/release/logging.properties.php.dist 2007-02-03 12:49:32 UTC (rev 4684)
+++ plog/branches/lifetype-1.2/release/logging.properties.php.dist 2007-02-03 13:00:46 UTC (rev 4685)
@@ -4,22 +4,31 @@
# 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",
+ "layout" => "%d %N - [%f:%l (%c:%F)] %m%n",
"appender" => "null",
- "file" => "tmp/plog.log",
- "prio" => "debug"
+ "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" => "%d %N - %m%n",
+ "layout" => "%S%n %d %N - %m%n",
"appender" => "file",
- "file" => "tmp/sql_error.log",
+ "file" => PLOG_CLASS_PATH."tmp/sql_error.log",
"prio" => "error"
);
@@ -30,7 +39,30 @@
$config["trackback"] = Array(
"layout" => "%d %N - [%f:%l (%c:%F)] %m%n",
"appender" => "null",
- "file" => "tmp/trackback.log",
+ "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" => "null",
+ "file" => PLOG_CLASS_PATH."tmp/metrics.log",
+ "prio" => "debug"
+ );
+
?>
Added: plog/branches/lifetype-1.2/release/userdata.properties.php.dist
===================================================================
--- plog/branches/lifetype-1.2/release/userdata.properties.php.dist (rev 0)
+++ plog/branches/lifetype-1.2/release/userdata.properties.php.dist 2007-02-03 13:00:46 UTC (rev 4685)
@@ -0,0 +1,119 @@
+<?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_",
+
+ // 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