[Pkg-voip-commits] r6408 - in /freepbx/branches/dbconfig-common/debian: freepbx-common.config freepbx-common.dirs freepbx-common.install freepbx-common.postinst freepbx-common.prerm share/amportal.conf share/amportal.conf.template

[odd_bloke-guest at alioth.debian.org]

Author: odd_bloke-guest
Date: Wed Nov 12 10:46:42 2008
New Revision: 6408

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6408
Log:
Beginnings of dbconfig-common work.

Added:
    freepbx/branches/dbconfig-common/debian/share/amportal.conf.template   (contents, props changed)
      - copied, changed from r6389, freepbx/branches/dbconfig-common/debian/share/amportal.conf
Removed:
    freepbx/branches/dbconfig-common/debian/share/amportal.conf
Modified:
    freepbx/branches/dbconfig-common/debian/freepbx-common.config
    freepbx/branches/dbconfig-common/debian/freepbx-common.dirs
    freepbx/branches/dbconfig-common/debian/freepbx-common.install
    freepbx/branches/dbconfig-common/debian/freepbx-common.postinst
    freepbx/branches/dbconfig-common/debian/freepbx-common.prerm

Modified: freepbx/branches/dbconfig-common/debian/freepbx-common.config
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/branches/dbconfig-common/debian/freepbx-common.config?rev=6408&op=diff
==============================================================================
--- freepbx/branches/dbconfig-common/debian/freepbx-common.config (original)
+++ freepbx/branches/dbconfig-common/debian/freepbx-common.config Wed Nov 12 10:46:42 2008
@@ -1,4 +1,6 @@
 #!/bin/sh
+
+set -e
 
 # source debconf stuff
 . /usr/share/debconf/confmodule

Modified: freepbx/branches/dbconfig-common/debian/freepbx-common.dirs
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/branches/dbconfig-common/debian/freepbx-common.dirs?rev=6408&op=diff
==============================================================================
--- freepbx/branches/dbconfig-common/debian/freepbx-common.dirs (original)
+++ freepbx/branches/dbconfig-common/debian/freepbx-common.dirs Wed Nov 12 10:46:42 2008
@@ -8,9 +8,6 @@
 usr/share/freepbx/modules/
 usr/share/freepbx/modules/_cache/
 usr/share/freepbx-common/
-usr/share/freepbx-common/sql/
-usr/share/freepbx-common/upgrades/
-usr/share/freepbx-common/upgrades/1.10.010/
 usr/share/freepbx/i18n/de_DE/
 usr/share/freepbx/i18n/es_ES/
 usr/share/freepbx/i18n/fr_FR/

Modified: freepbx/branches/dbconfig-common/debian/freepbx-common.install
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/branches/dbconfig-common/debian/freepbx-common.install?rev=6408&op=diff
==============================================================================
--- freepbx/branches/dbconfig-common/debian/freepbx-common.install (original)
+++ freepbx/branches/dbconfig-common/debian/freepbx-common.install Wed Nov 12 10:46:42 2008
@@ -24,6 +24,6 @@
 debian/share/post-reload/*				usr/share/freepbx-common/post-reload/
 
 SQL/newinstall.sql						usr/share/dbconfig-common/data/freepbx-common/install/mysql
-upgrades/*						usr/share/freepbx-common/upgrades/
 
 debian/apache2						etc/
+debian/share/amportal.conf.template      usr/share/freepbx-common/

Modified: freepbx/branches/dbconfig-common/debian/freepbx-common.postinst
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/branches/dbconfig-common/debian/freepbx-common.postinst?rev=6408&op=diff
==============================================================================
--- freepbx/branches/dbconfig-common/debian/freepbx-common.postinst (original)
+++ freepbx/branches/dbconfig-common/debian/freepbx-common.postinst Wed Nov 12 10:46:42 2008
@@ -81,6 +81,7 @@
 if [ -f /usr/share/dbconfig-common/dpkg/config.mysql ]; then
     . /usr/share/dbconfig-common/dpkg/config.mysql
     dbc_go freepbx-common $@
+    dbconfig-generate-include -f template -o template_infile=/usr/share/freepbx-common/amportal.conf.template /etc/dbconfig-common/freepbx-common.conf > /etc/amportal.conf
 fi
 
 case "$1" in

Modified: freepbx/branches/dbconfig-common/debian/freepbx-common.prerm
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/branches/dbconfig-common/debian/freepbx-common.prerm?rev=6408&op=diff
==============================================================================
--- freepbx/branches/dbconfig-common/debian/freepbx-common.prerm (original)
+++ freepbx/branches/dbconfig-common/debian/freepbx-common.prerm Wed Nov 12 10:46:42 2008
@@ -1,5 +1,7 @@
 #!/bin/sh
-# config maintainer script for freepbx-mysql
+# config maintainer script for freepbx-common
+
+set -e
 
 # source debconf stuff
 . /usr/share/debconf/confmodule
@@ -8,3 +10,5 @@
    . /usr/share/dbconfig-common/dpkg/config.mysql
    dbc_go freepbx-common $@
 fi
+
+#DEBHELPER#

Copied: freepbx/branches/dbconfig-common/debian/share/amportal.conf.template (from r6389, freepbx/branches/dbconfig-common/debian/share/amportal.conf)
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx/branches/dbconfig-common/debian/share/amportal.conf.template?rev=6408&op=diff
==============================================================================
--- freepbx/branches/dbconfig-common/debian/share/amportal.conf (original)
+++ freepbx/branches/dbconfig-common/debian/share/amportal.conf.template Wed Nov 12 10:46:42 2008
@@ -8,7 +8,7 @@
 
 # AMPDBENGINE - which SQL server to connect to (mysql,sqlite)
 # if none supplied will fallback to mysql
-AMPDBENGINE=mysql
+AMPDBENGINE=_DBC_DBTYPE_
 
 # AMPWEBADDRESS: the IP address or host name used to access the FreePBX web admin
 # leave empthy for autodetection (default)

Propchange: freepbx/branches/dbconfig-common/debian/share/amportal.conf.template
------------------------------------------------------------------------------
    svn:mergeinfo =