bin/dbq-dir2sqlite

diff --git a/etc/dbs.php b/etc/dbs.php
index 4b0fc1e7952ba89c40fd86a3eafa668bab80544c..11a7c7e72397df94b770253c3e9ce2ccaf0249a9 100644 (file)
--- a/etc/dbs.php
+++ b/etc/dbs.php
@@ -1,4 +1,5 @@
 <?php
+require_once dirname(__FILE__).'/../lib/php/nb.php';
 $CONF = array();
 #$dev = (bool)(stripos(gethostname(),'macbook') !== false);
 $LOCAL_DB = (
@@ -6,6 +7,20 @@ $LOCAL_DB = (
   and ! file_exists('/opt/local/var/run/mysql5/mysqld.sock')
 ) ? true : false;
 
+# Look for sqlite db path
+$DIR_SQLITE = '~nicoadm/ownCloud';
+foreach ([
+  '~nico/ownCloud',
+  '~nicoadm/ownCloud',
+] as $dir) {
+  $dir = nb::untilde($dir);
+  if (!is_readable($dir)) continue;
+  $DIR_SQLITE = $dir;
+  break;
+}
+if ($DIR_SQLITE) $DIR_SQLITE .= '/var/lib/sqlite';
+
+# Includes
 $dir = dirname(__FILE__).'/dbs';
 foreach (array(
   'postfix',
@@ -17,4 +32,5 @@ foreach (array(
 ) as $file) {
   if (file_exists("$dir/$file.php")) require_once("$dir/$file.php");
 }
+
 ?>

diff --git a/etc/dbs.yaml b/etc/dbs.yaml
index defbc91e082476629b5b13a06d534887bef6a3a6..0fc34a496e0a72365578abfa5a226549da6a2f8e 100644 (file)
--- a/etc/dbs.yaml
+++ b/etc/dbs.yaml
@@ -44,13 +44,6 @@ izi-dev:
 
 postfix:
   title: Postfix on Izideal
-  host: mail.izideal.vpn
+  host: admin.izideal.vpn
   user: postfix
   type: mysql
-
-owncloud:
-  host: /home/owncloud/data/owncloud.db
-  #host: /dev/shm/owncloud.db
-  #host: /opt/owncloud/data/owncloud.db
-  type: sqlite
-  default_table: oc_users

diff --git a/etc/dbs/nb.php b/etc/dbs/nb.php
index c1f06de7358cc20d68d28e7e7f37a0665d4305e1..e3a442d9d5d668a23050338e6053b43a02a5a23c 100644 (file)
--- a/etc/dbs/nb.php
+++ b/etc/dbs/nb.php
@@ -1,6 +1,5 @@
 <?php
 
-#bye($LOCAL_DB);
 $CONF['nb'] = array(
   'host' => 'admin.izideal.vpn',
   'type' => 'mysql',
@@ -11,7 +10,7 @@ $CONF['nb'] = array(
 );
 
 $CONF['nb-sqlite'] = array (
-  'pdo' => 'sqlite:'.nb::untilde('~nico/ownCloud/var/lib/sqlite/nb.db'),
+  'host' => "$DIR_SQLITE/nb.db",
   'type' => 'sqlite',
   '_import' => '_rent',
 );

diff --git a/etc/dbs/wp.php b/etc/dbs/wp.php
index fcb1202c34bbf308db9827b99489aa4ef3358122..f13220b26dbe9e566ed50fe41dabb7ee565f79e7 100644 (file)
--- a/etc/dbs/wp.php
+++ b/etc/dbs/wp.php
@@ -22,7 +22,7 @@ if (false and !empty($GLOBALS['wpdb'])) {
 }
 
 $CONF['wp-sqlite'] = array (
-  'host' => nb::untilde('~nico/ownCloud/var/lib/sqlite/wp.db'),
+  'host' => "$DIR_SQLITE/wp.db",
   'type' => 'sqlite',
   '_import' => '_wp',
 );