[pkg-kolab] r1575 - kolab-webadmin/trunk/debian

Mathieu Parent sathieu at alioth.debian.org
Sun Nov 20 13:52:30 UTC 2011


Author: sathieu
Date: 2011-11-20 13:52:28 +0000 (Sun, 20 Nov 2011)
New Revision: 1575

Added:
   kolab-webadmin/trunk/debian/config.php
   kolab-webadmin/trunk/debian/links
Removed:
   kolab-webadmin/trunk/debian/session_vars.php
Modified:
   kolab-webadmin/trunk/debian/README.Debian
   kolab-webadmin/trunk/debian/changelog
   kolab-webadmin/trunk/debian/install
   kolab-webadmin/trunk/debian/postinst
   kolab-webadmin/trunk/debian/preinst
Log:
Moved configuration and synced

- "/etc/kolab/session_vars.php" moved to "/etc/kolab/webadmin/config.php"
    to preserve base name
- config.php synced with upstream


Modified: kolab-webadmin/trunk/debian/README.Debian
===================================================================
--- kolab-webadmin/trunk/debian/README.Debian	2011-11-20 13:40:45 UTC (rev 1574)
+++ kolab-webadmin/trunk/debian/README.Debian	2011-11-20 13:52:28 UTC (rev 1575)
@@ -1,16 +1,16 @@
 == Setup web administration frontend ==
 
-First, set up /etc/kolab/session_vars.php. On a new installation, with kolabd
+First, set up /etc/kolab/webadmin/config.php. On a new installation, with kolabd
 bootstrapped the following commands should do it:
 
  sed -i -e "s at kolabserver.example.com@`grep '^fqdnhostname : ' \
-   /etc/kolab/kolab.conf | gawk '{ print $3 }'`@" /etc/kolab/session_vars.php
+   /etc/kolab/kolab.conf | gawk '{ print $3 }'`@" /etc/kolab/webadmin/config.php
  sed -i -e "s at dc=example,dc=com@`grep '^base_dn : ' \
-   /etc/kolab/kolab.conf | gawk '{ print $3 }'`@" /etc/kolab/session_vars.php
+   /etc/kolab/kolab.conf | gawk '{ print $3 }'`@" /etc/kolab/webadmin/config.php
  sed -i -e "s at PASSWORD@`grep '^php_pw : ' \
-   /etc/kolab/kolab.conf | gawk '{ print $3 }'`@" /etc/kolab/session_vars.php
+   /etc/kolab/kolab.conf | gawk '{ print $3 }'`@" /etc/kolab/webadmin/config.php
  sed  -i -e "s at cn=nobody,cn=internal,dc=example,dc=com@`grep '^php_dn : ' \
-   /etc/kolab/kolab.conf | gawk '{ print $3 }'`@" /etc/kolab/session_vars.php
+   /etc/kolab/kolab.conf | gawk '{ print $3 }'`@" /etc/kolab/webadmin/config.php
 
 Then, to activate the web site, in order of preference,
 
@@ -26,7 +26,7 @@
 - or -
 
  (c) Symlink /etc/kolab/kolab-webadmin-apache.conf to
-     /etc/apache2/conf.d/kolab-webadmin.  (This is obviously insecure,
+     /etc/apache2/conf.d/kolab-webadmin.conf.  (This is obviously insecure,
      but good enough for testing.)
 
 Reload Apache afterwards in any case.

Modified: kolab-webadmin/trunk/debian/changelog
===================================================================
--- kolab-webadmin/trunk/debian/changelog	2011-11-20 13:40:45 UTC (rev 1574)
+++ kolab-webadmin/trunk/debian/changelog	2011-11-20 13:52:28 UTC (rev 1575)
@@ -14,6 +14,10 @@
   * Moved to pkg-php-tools (>= 0.6 for aNN and bNN support)
     - Templates are now in /usr/share/php/data/KolabAdmin/templates
       (Closes: 563694)
+  * Configuration:
+    - "/etc/kolab/session_vars.php" moved to "/etc/kolab/webadmin/config.php"
+      to preserve base name
+    - config.php synced with upstream
 
  -- Mathieu Parent <sathieu at debian.org>  Wed, 06 Apr 2011 19:23:56 +0200
 

Copied: kolab-webadmin/trunk/debian/config.php (from rev 1569, kolab-webadmin/trunk/debian/session_vars.php)
===================================================================
--- kolab-webadmin/trunk/debian/config.php	                        (rev 0)
+++ kolab-webadmin/trunk/debian/config.php	2011-11-20 13:52:28 UTC (rev 1575)
@@ -0,0 +1,110 @@
+<?php
+/**
+ * (c) 2005 Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
+ * (c) 2004 Klarälvdalens Datakonsult AB
+ * (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
+ * (c) 2003 Martin Konold <martin.konold at erfrakon.de>
+ *
+ *    Written by Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
+ *
+ *  This  program is free  software; you can redistribute  it and/or
+ *  modify it  under the terms of the GNU  General Public License as
+ *  published by the  Free Software Foundation; either version 2, or
+ *  (at your option) any later version.
+ *
+ *  This program is  distributed in the hope that it will be useful,
+ *  but WITHOUT  ANY WARRANTY; without even the  implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ *  General Public License for more details.
+ *
+ *  You can view the  GNU General Public License, online, at the GNU
+ *  Project's homepage; see <http://www.gnu.org/licenses/gpl.html>.
+ */
+
+$topdir = '/admin';
+$kolab_prefix = '/usr';
+$php_dir      = '/usr/share/php';
+$locale_dir   = "$php_dir/data/KolabAdmin/locale/";
+$smarty_compiledir = '/var/cache/kolab-webadmin/templates/';
+
+require_once('smarty/libs/Smarty.class.php');
+
+$webserver_web_prefix = '';
+
+$WITHOPENPKG = 'no';
+$RPM = '';
+$kolab_pkgs = '';
+$pear_horde_pkgs = '';
+$kolabversion = 'unknown';
+
+/*
+ * Session variables fetched from LDAP
+ *
+ * TODO(steffen): Make those variables non-session variables.
+ * We dont really need to store those in the session,
+ * since we source this file on every invokation anyway.
+ */
+
+ at session_start();
+
+$_SESSION['fqdnhostname'] = "kolabserver.example.com";
+$_SESSION['ldap_master_uri'] = "ldap://127.0.0.1:389";
+$_SESSION['base_dn'] = "dc=example,dc=com";
+$_SESSION['php_dn'] = "cn=nobody,cn=internal,dc=example,dc=com";
+$_SESSION['php_pw'] = "PASSWORD";
+
+
+/***********************************************************************
+ * Global config
+ */
+
+$params = array();
+
+/*
+ * Entry location of the web admin user interface.
+ */
+$params['kolab_wui'] = '/admin';
+
+/*
+ * Which user classes can log in to the webgui?
+ * Currently 4 user classes exist: user, admin, maintainer and manager
+ */
+$params['allow_user_classes'] = array( 'user', 'admin', 'maintainer', 'manager', 'domain-maintainer' );
+
+/*
+ * Array to configure visibility/access of LDAP attributes to user's account object
+ *
+ * Possible values for attribute is 
+ *
+ * 'ro' (readonly)
+ * 'rw' (read/write)
+ * 'hidden' (atribute removed from display)
+ * 'mandatory' (read/write and must not be empty)
+ *
+ * If an attribute is not in this array, it defaults to 'rw'
+ *
+ * Note, attributes correspond to form attribute names and not LDAP attribute names.
+ *
+ * TODO(steffen): Make form and LDAP attributes the same.
+ */
+
+$params['attribute_access'] = array(
+			 /*
+                         // Examples
+			 'firstname'  => 'ro',
+			 'lastname'   => 'ro',
+			 'password'   => 'rw',
+			 'mail'       => 'ro',
+			 'uid'        => 'ro',
+			 'title'      => 'ro',
+			 'roomNumber' => 'mandatory',
+			 'kolabdelegate'  => 'ro',
+			 'telephoneNumber' => 'hidden'
+			 */
+);
+
+/**
+ * Hide section administrative email addresses (hostmaster at ..., postmaster at ...)
+ * in the "Settings" section.
+ */
+define('HIDE_ADMINISTRATIVE_EMAILSETTINGS', false);

Modified: kolab-webadmin/trunk/debian/install
===================================================================
--- kolab-webadmin/trunk/debian/install	2011-11-20 13:40:45 UTC (rev 1574)
+++ kolab-webadmin/trunk/debian/install	2011-11-20 13:52:28 UTC (rev 1575)
@@ -1,3 +1,3 @@
 debian/kolab-webadmin-apache.conf etc/kolab/
-debian/session_vars.php etc/kolab/
+debian/config.php etc/kolab/webadmin
 

Added: kolab-webadmin/trunk/debian/links
===================================================================
--- kolab-webadmin/trunk/debian/links	                        (rev 0)
+++ kolab-webadmin/trunk/debian/links	2011-11-20 13:52:28 UTC (rev 1575)
@@ -0,0 +1,2 @@
+etc/kolab/webadmin/config.php usr/share/php/KolabAdmin/include/config.php
+

Modified: kolab-webadmin/trunk/debian/postinst
===================================================================
--- kolab-webadmin/trunk/debian/postinst	2011-11-20 13:40:45 UTC (rev 1574)
+++ kolab-webadmin/trunk/debian/postinst	2011-11-20 13:52:28 UTC (rev 1575)
@@ -28,6 +28,9 @@
         mv_conffile "/etc/kolab-webadmin/session_vars.php" "/etc/kolab/session_vars.php"
         rmdir /etc/kolab-webadmin 2>/dev/null || true
     fi
+    if dpkg --compare-versions "$2" le "2.3.4-20110927-1"; then
+        mv_conffile "/etc/kolab/session_vars.php" "/etc/kolab/webadmin/config.php"
+    fi
 esac
 
 #DEBHELPER#

Modified: kolab-webadmin/trunk/debian/preinst
===================================================================
--- kolab-webadmin/trunk/debian/preinst	2011-11-20 13:40:45 UTC (rev 1574)
+++ kolab-webadmin/trunk/debian/preinst	2011-11-20 13:52:28 UTC (rev 1575)
@@ -21,4 +21,7 @@
     if dpkg --compare-versions "$2" le "2.2.1-20090331-1"; then
         prep_mv_conffile kolab-webadmin "/etc/kolab-webadmin/session_vars.php"
     fi
+    if dpkg --compare-versions "$2" le "2.3.4-20110927-1"; then
+        prep_mv_conffile kolab-webadmin "/etc/kolab/session_vars.php"
+    fi
 esac

Deleted: kolab-webadmin/trunk/debian/session_vars.php
===================================================================
--- kolab-webadmin/trunk/debian/session_vars.php	2011-11-20 13:40:45 UTC (rev 1574)
+++ kolab-webadmin/trunk/debian/session_vars.php	2011-11-20 13:52:28 UTC (rev 1575)
@@ -1,71 +0,0 @@
-<?php
-/*
-# (c) 2005 Steffen Hansen <steffen at klaralvdalens-datakonsult.se>
-# (c) 2003 Tassilo Erlewein <tassilo.erlewein at erfrakon.de>
-# (c) 2003 Martin Konold <martin.konold at erfrakon.de>
-# This program is Free Software under the GNU General Public License (>=v2).
-# Read the file COPYING that comes with this packages for details.
-
-*/
-
-/*
- * Session variables fetched from LDAP
- *
- * TODO(steffen): Make those variables non-session variables.
- * We dont really need to store those in the session,
- * since we source this file on every invokation anyway.
- */
-
- at session_start();
-
-$_SESSION['fqdnhostname'] = "kolabserver.example.com";
-$_SESSION['ldap_master_uri'] = "ldap://127.0.0.1:389";
-$_SESSION['base_dn'] = "dc=example,dc=com";
-$_SESSION['php_dn'] = "cn=nobody,cn=internal,dc=example,dc=com";
-$_SESSION['php_pw'] = "PASSWORD";
-
-
-/***********************************************************************
- * Global config
- */
-
-$params = array();
-
-/*
- * Which user classes can log in to the webgui?
- * Currently 4 user classes exist: user, admin, maintainer and manager
- */
-$params['allow_user_classes'] = array( 'user', 'admin', 'maintainer', 'manager', 'domain-maintainer' );
-
-/*
- * Array to configure visibility/access of LDAP attributes to user's account object
- *
- * Possible values for attribute is 
- *
- * 'ro' (readonly)
- * 'rw' (read/write)
- * 'hidden' (atribute removed from display)
- * 'mandatory' (read/write and must not be empty)
- *
- * If an attribute is not in this array, it defaults to 'rw'
- *
- * Note, attributes correspond to form attribute names and not LDAP attribute names.
- *
- * TODO(steffen): Make form and LDAP attributes the same.
- */
-
-$params['attribute_access'] = array(
-			 /*
-                         // Examples
-			 'firstname'  => 'ro',
-			 'lastname'   => 'ro',
-			 'password'   => 'rw',
-			 'mail'       => 'ro',
-			 'uid'        => 'ro',
-			 'title'      => 'ro',
-			 'roomNumber' => 'mandatory',
-			 'kolabdelegate'  => 'ro',
-			 'telephoneNumber' => 'hidden'
-			 */
-);
-?>




More information about the pkg-kolab-devel mailing list