Branch 'production' - 3 commits - kolab.org/www

[Torsten Grote]

 kolab.org/www/drupal-7.16/sites/default/conf.php      |   14 ++++++++
 kolab.org/www/drupal-7.16/sites/default/db_prefix.php |   29 ++++++++++++++++++
 kolab.org/www/public_html                             |    2 -
 3 files changed, 44 insertions(+), 1 deletion(-)

New commits:
commit 7f1a5583086bdac027fb58a9970590ae40fe4849
Author: Torsten Grote <grote at kolabsys.com>
Date:   Thu Oct 25 17:00:34 2012 +0200

    added missing conf file

diff --git a/kolab.org/www/drupal-7.16/sites/default/conf.php b/kolab.org/www/drupal-7.16/sites/default/conf.php
new file mode 100644
index 0000000..cab28e9
--- /dev/null
+++ b/kolab.org/www/drupal-7.16/sites/default/conf.php
@@ -0,0 +1,14 @@
+<?php
+
+    $conf = array(
+            'file_directory_path'   => 'sites/default/files',
+            'page_compression'      => '0',
+            'user_pictures'         => '1',
+            'user_picture_path'     => 'pictures'
+        );
+
+    include($_SERVER['DOCUMENT_ROOT'] . "/sites/all/conf.php");
+
+    include($_SERVER['DOCUMENT_ROOT'] . "/../private_conf.php");
+
+?>


commit 1922c24f353aeda0766fc09bb22b4bdc453ce928
Author: Torsten Grote <grote at kolabsys.com>
Date:   Thu Oct 25 16:57:22 2012 +0200

    added missing db prefix

diff --git a/kolab.org/www/drupal-7.16/sites/default/db_prefix.php b/kolab.org/www/drupal-7.16/sites/default/db_prefix.php
new file mode 100644
index 0000000..6e9c1e0
--- /dev/null
+++ b/kolab.org/www/drupal-7.16/sites/default/db_prefix.php
@@ -0,0 +1,29 @@
+<?php
+
+    $databases['default']['default']['prefix'] = array(
+        'authmap'           => 'shared_',
+        'captcha_points'    => 'shared_',
+        'default'           => 'www_',
+        'filters'           => 'shared_',
+        'filter_formats'    => 'shared_',
+        'ldapauth'          => 'shared_',
+        'og'                => 'shared_',
+        'og_access_roles'   => 'shared_',
+        'og_ancestry'       => 'shared_',
+        'og_notifications'  => 'shared_',
+        'og_uid'            => 'shared_',
+        'og_users_roles'    => 'shared_',
+        'profile_fields'    => 'shared_',
+        'profile_values'    => 'shared_',
+        'role'              => 'shared_',
+        'sessions'          => 'shared_',
+        'twitter'           => 'shared_',
+        'twitter_account'   => 'shared_',
+        'twitter_user'      => 'shared_',
+        'users'             => 'shared_',
+        'users_roles'       => 'shared_',
+        'vocabulary'        => 'shared_',
+        'wysiwyg'           => 'shared_'
+    );
+
+?>


commit f25641c8446c127a9b45d2475f3baba0b991a3b0
Author: Torsten Grote <grote at kolabsys.com>
Date:   Thu Oct 25 16:47:59 2012 +0200

    go live with drupal core update

diff --git a/kolab.org/www/public_html b/kolab.org/www/public_html
index f8a1d0f..622cf6b 120000
--- a/kolab.org/www/public_html
+++ b/kolab.org/www/public_html
@@ -1 +1 @@
-drupal-7.15
\ No newline at end of file
+drupal-7.16/
\ No newline at end of file