summaryrefslogtreecommitdiff
path: root/kolab-webclient/ingo
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2010-01-22 21:11:38 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2010-01-22 21:11:38 (GMT)
commit7d695c4e268fd0c46d4311e92edbc98dd7687ff9 (patch)
treebe4af3ba0ea5ae125298ffe3bcd0970f1aafc07d /kolab-webclient/ingo
parent5448a7ef82620037843317b9dc1e81edfcd1e6fd (diff)
downloadserver-7d695c4e268fd0c46d4311e92edbc98dd7687ff9.tar.gz
Complete the ingo package.
Diffstat (limited to 'kolab-webclient/ingo')
-rw-r--r--kolab-webclient/ingo/configuration/ingo-1.2.3/conf.php19
-rw-r--r--kolab-webclient/ingo/ingo.spec10
-rw-r--r--kolab-webclient/ingo/templates/ingo-1.2.3/webclient-ingo_backends.php.template6
-rw-r--r--kolab-webclient/ingo/templates/ingo-1.2.3/webclient-ingo_conf.php.template6
-rw-r--r--kolab-webclient/ingo/templates/ingo-1.2.3/webclient-ingo_fields.php.template6
-rw-r--r--kolab-webclient/ingo/templates/ingo-1.2.3/webclient-ingo_hooks.php.template6
-rw-r--r--kolab-webclient/ingo/templates/ingo-1.2.3/webclient-ingo_prefs.php.template6
7 files changed, 50 insertions, 9 deletions
diff --git a/kolab-webclient/ingo/configuration/ingo-1.2.3/conf.php b/kolab-webclient/ingo/configuration/ingo-1.2.3/conf.php
new file mode 100644
index 0000000..d134396
--- /dev/null
+++ b/kolab-webclient/ingo/configuration/ingo-1.2.3/conf.php
@@ -0,0 +1,19 @@
+<?php
+/* CONFIG START. DO NOT CHANGE ANYTHING IN OR AFTER THIS LINE. */
+// $Horde: ingo/config/conf.xml,v 1.13.12.1 2007/12/20 14:05:46 jan Exp $
+$conf['menu']['apps'] = array();
+$conf['storage']['driver'] = 'prefs';
+$conf['storage']['maxblacklist'] = 0;
+$conf['storage']['maxwhitelist'] = 0;
+$conf['rules']['userheader'] = true;
+$conf['rules']['usefolderapi'] = true;
+$conf['spam']['header'] = 'X-Spam-Level';
+$conf['spam']['char'] = '*';
+$conf['spam']['compare'] = 'string';
+$conf['hooks']['vacation_addresses'] = false;
+$conf['hooks']['vacation_only'] = true;
+/* CONFIG END. DO NOT CHANGE ANYTHING IN OR BEFORE THIS LINE. */
+if (file_exists(dirname(__FILE__) . '/conf.local.php')) {
+ require(dirname(__FILE__) . '/conf.local.php');
+}
+
diff --git a/kolab-webclient/ingo/ingo.spec b/kolab-webclient/ingo/ingo.spec
index a0d1d42..d262eb1 100644
--- a/kolab-webclient/ingo/ingo.spec
+++ b/kolab-webclient/ingo/ingo.spec
@@ -1,7 +1,7 @@
# Macros
%define V_package ingo
%define V_version 1.2.3
-%define V_release 20100118
+%define V_release 20100122
# Package Information
Name: %{V_package}
@@ -23,6 +23,7 @@ Source4: webclient-ingo_hooks.php.template
Source5: webclient-ingo_prefs.php.template
Source6: 10-kolab_backends_base.php
Source7: 10-kolab_conf_base.php
+Source8: conf.php
# List of Patches
Patch0: package.patch
@@ -34,8 +35,8 @@ BuildRoot: %{l_buildroot}
#Pre requisites
BuildPreReq: OpenPKG, openpkg >= 20070603
BuildPreReq: php, php::with_pear = yes
-PreReq: horde-3.3.6
-PreReq: imp-4.3.6
+PreReq: horde >= 3.3.6
+PreReq: imp >= 4.3.6
PreReq: PEAR-Net_Sieve
AutoReq: no
@@ -93,6 +94,7 @@ filtering agent in INGO H3 (4.x).
%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:6} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/ingo/config/backends.d/
%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:7} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/ingo/config/conf.d/
+ %{l_shtool} install -c -m 644 %{l_value -s -a} %{S:8} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/ingo/config/
sed -i -e 's#@@@horde_confdir@@@#%{l_prefix}/var/kolab/www/client/ingo/config#' $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates/*.php.template
@@ -102,7 +104,7 @@ filtering agent in INGO H3 (4.x).
'%config %{l_prefix}/etc/kolab/templates/webclient-ingo_fields.php.template' \
'%config %{l_prefix}/etc/kolab/templates/webclient-ingo_hooks.php.template' \
'%config %{l_prefix}/etc/kolab/templates/webclient-ingo_prefs.php.template' \
-# '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/ingo/config/conf.php
+ '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/ingo/config/conf.php
%clean
rm -rf $RPM_BUILD_ROOT
diff --git a/kolab-webclient/ingo/templates/ingo-1.2.3/webclient-ingo_backends.php.template b/kolab-webclient/ingo/templates/ingo-1.2.3/webclient-ingo_backends.php.template
index b234226..4ab3baa 100644
--- a/kolab-webclient/ingo/templates/ingo-1.2.3/webclient-ingo_backends.php.template
+++ b/kolab-webclient/ingo/templates/ingo-1.2.3/webclient-ingo_backends.php.template
@@ -1,9 +1,13 @@
KOLAB_META_START
-TARGET=@@@ingo_confdir@@@/backends.local.php
+TARGET=@@@ingo_confdir@@@/backends.d/20-kolab_local.php
PERMISSIONS=0400
OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@
KOLAB_META_END
<?php
+/*
+@@@warning@@@
+*/
+
/* This file can be used to customize your kolab-webclient installation. */
/* Anything you add to this configuration file will override settings */
/* from @@@ingo_confdir@@@/backends.php
diff --git a/kolab-webclient/ingo/templates/ingo-1.2.3/webclient-ingo_conf.php.template b/kolab-webclient/ingo/templates/ingo-1.2.3/webclient-ingo_conf.php.template
index 86922b7..6a80729 100644
--- a/kolab-webclient/ingo/templates/ingo-1.2.3/webclient-ingo_conf.php.template
+++ b/kolab-webclient/ingo/templates/ingo-1.2.3/webclient-ingo_conf.php.template
@@ -1,9 +1,13 @@
KOLAB_META_START
-TARGET=@@@ingo_confdir@@@/conf.local.php
+TARGET=@@@ingo_confdir@@@/conf.d/20-kolab_local.php
PERMISSIONS=0400
OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@
KOLAB_META_END
<?php
+/*
+@@@warning@@@
+*/
+
/* This file can be used to customize your kolab-webclient installation. */
/* Anything you add to this configuration file will override settings */
/* from @@@ingo_confdir@@@/conf.php
diff --git a/kolab-webclient/ingo/templates/ingo-1.2.3/webclient-ingo_fields.php.template b/kolab-webclient/ingo/templates/ingo-1.2.3/webclient-ingo_fields.php.template
index d2af783..c1b3f8d 100644
--- a/kolab-webclient/ingo/templates/ingo-1.2.3/webclient-ingo_fields.php.template
+++ b/kolab-webclient/ingo/templates/ingo-1.2.3/webclient-ingo_fields.php.template
@@ -1,9 +1,13 @@
KOLAB_META_START
-TARGET=@@@ingo_confdir@@@/fields.local.php
+TARGET=@@@ingo_confdir@@@/fields.d/20-kolab_local.php
PERMISSIONS=0400
OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@
KOLAB_META_END
<?php
+/*
+@@@warning@@@
+*/
+
/* This file can be used to customize your kolab-webclient installation. */
/* Anything you add to this configuration file will override settings */
/* from @@@ingo_confdir@@@/fields.php
diff --git a/kolab-webclient/ingo/templates/ingo-1.2.3/webclient-ingo_hooks.php.template b/kolab-webclient/ingo/templates/ingo-1.2.3/webclient-ingo_hooks.php.template
index dbbd7bb..ac37ae4 100644
--- a/kolab-webclient/ingo/templates/ingo-1.2.3/webclient-ingo_hooks.php.template
+++ b/kolab-webclient/ingo/templates/ingo-1.2.3/webclient-ingo_hooks.php.template
@@ -1,9 +1,13 @@
KOLAB_META_START
-TARGET=@@@ingo_confdir@@@/hooks.local.php
+TARGET=@@@ingo_confdir@@@/hooks.d/20-kolab_local.php
PERMISSIONS=0400
OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@
KOLAB_META_END
<?php
+/*
+@@@warning@@@
+*/
+
/* This file can be used to customize your kolab-webclient installation. */
/* Anything you add to this configuration file will override settings */
/* from @@@ingo_confdir@@@/hooks.php
diff --git a/kolab-webclient/ingo/templates/ingo-1.2.3/webclient-ingo_prefs.php.template b/kolab-webclient/ingo/templates/ingo-1.2.3/webclient-ingo_prefs.php.template
index 6a1cbd7..9872687 100644
--- a/kolab-webclient/ingo/templates/ingo-1.2.3/webclient-ingo_prefs.php.template
+++ b/kolab-webclient/ingo/templates/ingo-1.2.3/webclient-ingo_prefs.php.template
@@ -1,9 +1,13 @@
KOLAB_META_START
-TARGET=@@@ingo_confdir@@@/prefs.local.php
+TARGET=@@@ingo_confdir@@@/prefs.d/20-kolab_local.php
PERMISSIONS=0400
OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@
KOLAB_META_END
<?php
+/*
+@@@warning@@@
+*/
+
/* This file can be used to customize your kolab-webclient installation. */
/* Anything you add to this configuration file will override settings */
/* from @@@ingo_confdir@@@/prefs.php