Skip to content

Commit

Permalink
Merge branch '1.0.11-fixes'
Browse files Browse the repository at this point in the history
  • Loading branch information
Mortier Benoit committed May 3, 2016
2 parents b3a0de1 + 1a5417d commit 4854b67
Show file tree
Hide file tree
Showing 44 changed files with 3,580 additions and 3,346 deletions.
4 changes: 4 additions & 0 deletions AUTHORS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,3 +177,7 @@ documentation and additional help.

* Tobias Göbel
Fixes for PHP7 compatibility

* Christian Kreidl <christian.kreidl@ziti.uni-heidelberg.de>
ppolicy improvement

27 changes: 27 additions & 0 deletions Changelog
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,33 @@
FusionDirectory changelog
=========================

* FusionDirectory 1.0.12

Bugs #4645: Could not add groups to user templates
FusionDirectory plugins - Bugs #4658: csv import with empty field
Bugs #4678: group : member objects list
FusionDirectory plugins - Bugs #4689: we should be able to create mail address without having a server and a service referenced
FusionDirectory plugins - Bugs #4692: remove the antivirus service
FusionDirectory plugins - Bugs #4699: move postfix service in his own plugin
FusionDirectory plugins - Bugs #4706: move the spamassasin service to his own plugin
Bugs #4713: remove the antivirus service icons
FusionDirectory plugins - Bugs #4714: leftover in services-fd.schema of the removal of the asterisk plugin
FusionDirectory plugins - Bugs #4721: move the spam options for the mail user tab to a spamassasin user tab
Bugs #4735: nginx + php-fpm with fusiondirectory
Bugs #4737: we should remove data['SERVERS']['IMAP'] from config
FusionDirectory plugins - Bugs #4739: remove the option Use custom sieve script (disables all Mail options!)
FusionDirectory plugins - Bugs #4740: in the cyrus service the hostname, port should be mandatory
FusionDirectory plugins - Bugs #4741: in the dovecot service the hostname, port should be mandatory
FusionDirectory plugins - Bugs #4742: ppolicy: description cannot be set
Bugs #4746: Error when saving user if objectClass person is missing.
Bugs #4754: user template : %r|% does not work in password
Bugs #4756: Update documentation with fixes/dev repos info.
Wishlist #4687: ACL assignments can’t give rights to groups.
Wishlist #4722: Use Nginx instead of Apache2
Wishlist #4738: extend the search query to email
FusionDirectory plugins - Wishlist #4743: ppolicy: user interface improvements
Wishlist #4755: user template: password should show only one field

* FusionDirectory 1.0.11

|Fix] FusionDirectory plugins - Bugs #4391: Choices order seems random in shell
Expand Down
181 changes: 181 additions & 0 deletions contrib/docs/UPGRADE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1291,6 +1291,187 @@ Upgrade FusionDirectory schema package too.
apt-get install fusiondirectory-schema


Migrate FusionDirectory from 1.0.11 to 1.0.12
=============================================

Ubuntu 12.0.4 TLS users
=======================

Since 1.0.9.2 FusionDirectory need the php-cas library for CAS server support. This library can normally found in universe in the Ubuntu repositories

In case you did not find it, grab the deb from here and install it

http://packages.ubuntu.com/trusty/all/php-cas/download

and select your preferred mirror

Mail
====

In this version the mail plugin has been cleaned and his dependency to the systems has been removed.
In the mean time the postfix and spamassassin service have been moved in their own plugins. The antivirus service have been removed.

The old spamassasin settings from the mail / user tab have been rewritten and moved to a spamassasin, they now support the real LDAP backend of spamassasin.
So you will need to move your data to the new format before using them.

Upgrade FusionDirectory first
=============================

Upgrade FusionDirectory core package before other ones to avoid dependencies errors:

apt-get install fusiondirectory

Upgrade FusionDirectory schema package too.

apt-get install fusiondirectory-schema

Upgrade of LDAP directory
=========================

- if your are using the mail plugin you have to update its schema

fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/mail-fd.schema

fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/mail-fd-conf.schema

- if your are using the system plugin you have to update its schemas

fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/service-fd.schema

Postfix plugin
==============

- if you where using the postfix service in 1.0.11, you need to install the postfix plugin and insert the postfix schema

apt-get install fusiondirectory-plugin-postfix

apt-get install fusiondirectory-plugin-postfix-schema

fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/postfix-fd.schema

Spamassasin plugin
==================

- if you where using the spamassin service in 1.0.11, you need to install the spamassassin plugin and insert the spamassasin schema

apt-get install fusiondirectory-plugin-spamassassin

apt-get install fusiondirectory-plugin-spamassassin-schema

fusiondirectory-insert-schema -m /etc/ldap/schema/fusiondirectory/spamassassin-fd.schema


Remove old schema from /etc/ldap/schema/fusiondirectory
=======================================================

The old schema are not automatically removed from /etc/ldap/schema/fusiondirectory.
You can safely remove recovery-fd.schema and asterisk-fd-conf.schema if they still exist

Check for deprecated attributes and objectClasses in your LDAP

fusiondirectory-setup --list-deprecated show deprecated attributes and objectClasses for FusionDirectory

fusiondirectory-setup --list-deprecated
List deprecated attributes and objectclasses
Deprecated attributes:
gotoFilesystem (GOto - Gonicus Terminal Concept, value filesystem.) - 1.3.6.1.4.1.10098.1.1.1.6
gotoFloppyEnable (GOto - Gonicus Terminal Concept, value floppyEnable.) - 1.3.6.1.4.1.10098.1.1.1.7
gotoSysStatus (Keeps current system status - info shown in GOsa) - 1.3.6.1.4.1.10098.1.1.2.11
gotoXColordepth (GOto - Gonicus Terminal Concept, value xColordepth.) - 1.3.6.1.4.1.10098.1.1.1.21
gotoHardwareChecksum (GOto - quick way to see if something has changed) - 1.3.6.1.4.1.10098.1.1.2.12
goFaxPassword (Admin password for fax server) - 1.3.6.1.4.1.10098.1.1.9.23
gotoNtpServer (GOto - Gonicus Terminal Concept, value ntpServer.) - 1.3.6.1.4.1.10098.1.1.1.2
gotoXDriver (GOto - Gonicus Terminal Concept, value xDriver.) - 1.3.6.1.4.1.10098.1.1.1.28
fdSnapshotAdminDn (FusionDirectory - Snaphost admin dn) - 1.3.6.1.4.1.38414.8.17.4
fdPersonalTitleInDN (FusionDirectory - Personal title in dn) - 1.3.6.1.4.1.38414.8.12.5
gotoXMouseport (GOto - Gonicus Terminal Concept, value xMouseport.) - 1.3.6.1.4.1.10098.1.1.1.22
gotoAdaptPath (GOto - Gonicus Terminal Concept, value adaptpath.) - 1.3.6.1.4.1.10098.1.1.1.33
goFonCountryCode (Store country code) - 1.3.6.1.4.1.10098.1.1.9.29
gotoSndModule (GOto - Gonicus Terminal Concept, value sound Modules.) - 1.3.6.1.4.1.10098.1.1.1.29
gotoXKbLayout (GOto - Gonicus Terminal Concept, value xKblayout.) - 1.3.6.1.4.1.10098.1.1.1.26
gotoProfileFlags (GOto - Flags for Profile handling - C is for caching) - 1.3.6.1.4.1.10098.1.1.11.7
ghSoundAdapter (Hardware definitions, value soundAdapter) - 1.3.6.1.4.1.10098.1.1.2.7
gotoScannerModel (GOto - Gonicus Terminal Concept, value scannerModel.) - 1.3.6.1.4.1.10098.1.1.1.40
gotoScannerEnable (GOto - Gonicus Terminal Concept, value scannerEnable.) - 1.3.6.1.4.1.10098.1.1.1.10
gosaSubtreeACL (GOsa - ACL entry) - 1.3.6.1.4.1.10098.1.1.12.1
ghUsbSupport (Hardware definitions, value usbSupport) - 1.3.6.1.4.1.10098.1.1.2.3
gotoLpdEnable (GOto - Gonicus Terminal Concept, value lpdEnable.) - 1.3.6.1.4.1.10098.1.1.1.9
gotoProfileQuota (GOto - save quota for home) - 1.3.6.1.4.1.10098.1.1.11.15
gotoScannerBackend (GOto - Gonicus Terminal Concept, value scannerBackend.) - 1.3.6.1.4.1.10098.1.1.1.39
goSyslogSection (What sections wants the server for its syslog service? i.e. *.*) - 1.3.6.1.4.1.10098.1.1.9.9
fdAccountRDN (FusionDirectory - use a placeholder pattern for generating account RDNs) - 1.3.6.1.4.1.38414.8.12.2
goFaxAdmin (Admin principal for fax server) - 1.3.6.1.4.1.10098.1.1.9.22
goLogDriver (FD logging MDB2 driver name) - 1.3.6.1.4.1.10098.1.1.9.84
ghNetNic (Hardware definitions, value Network Device) - 1.3.6.1.4.1.10098.1.1.2.8
academicTitle (Field to represent the academic title) - 1.3.6.1.4.1.10098.1.1.6.2
fdPhoneMacroRDN (FusionDirectory - Phone macro RDN) - 1.3.6.1.4.1.38414.19.10.2
gosaLoginRestriction (GOsa - Multivalue attribute to carry a number of allowed ips/subnets) - 1.3.6.1.4.1.10098.1.1.12.46
gotoLpdServer (GOto - Gonicus Terminal Concept, value lpdServer.) - 1.3.6.1.4.1.10098.1.1.1.4
ghCpuType (Hardware definitions, value cpuType) - 1.3.6.1.4.1.10098.1.1.2.1
gotoXMonitor (GOto - Gonicus Terminal Concept, value xMonitor.) - 1.3.6.1.4.1.10098.1.1.1.17
fdRfc2307bis (FusionDirectory - rfc2307bis) - 1.3.6.1.4.1.38414.8.10.1
gotoXVsync (GOto - Gonicus Terminal Concept, value xVsync.) - 1.3.6.1.4.1.10098.1.1.1.19
fdSipContexts (FusionDirectory - available sip contexts) - 1.3.6.1.4.1.38414.19.11.1
gotoShare (GOto - specifies a share) - 1.3.6.1.4.1.10098.1.1.11.9
fdCopyPaste (FusionDirectory - (de)Activate copy/paste) - 1.3.6.1.4.1.38414.8.14.5
goLogPassword (Admin password for log server) - 1.3.6.1.4.1.10098.1.1.9.25
gotoCdromEnable (GOto - Gonicus Terminal Concept, value cdromEnable.) - 1.3.6.1.4.1.10098.1.1.1.8
gotoProfileServer (GOto - specifies the profile server) - 1.3.6.1.4.1.10098.1.1.11.8
fdSnapshotAdminPassword (FusionDirectory - Snaphost admin password) - 1.3.6.1.4.1.38414.8.17.5
ghMemSize (Hardware definitions, value memSize) - 1.3.6.1.4.1.10098.1.1.2.2
fdSnapshotURI (FusionDirectory - Snaphost URI) - 1.3.6.1.4.1.38414.8.17.3
gotoAutoFs (GOto - Gonicus Terminal Concept, value autofs.) - 1.3.6.1.4.1.10098.1.1.1.31
goFonAreaCode (Store area code) - 1.3.6.1.4.1.10098.1.1.9.28
ghInventoryNumber (Unique number for inclusion in an inventory) - 1.3.6.1.4.1.10098.1.1.2.10
fdPhoneConferenceRDN (FusionDirectory - Phone conference RDN) - 1.3.6.1.4.1.38414.19.10.3
gotoXMouseType (Hardware definitions, value Type of mouse) - 1.3.6.1.4.1.10098.1.1.1.34
fdPrimaryGroupFilter (FusionDirectory - Primary group filter) - 1.3.6.1.4.1.38414.8.14.1
gotoXHsync (GOto - Gonicus Terminal Concept, value xHsync.) - 1.3.6.1.4.1.10098.1.1.1.18
gosaDefaultLanguage (GOsa - Defines the default language for a user) - 1.3.6.1.4.1.10098.1.1.12.14
ghIdeDev (Hardware definitions, value ideDev) - 1.3.6.1.4.1.10098.1.1.2.4
gotoXKbVariant (GOto - Gonicus Terminal Concept, value xKbvariant.) - 1.3.6.1.4.1.10098.1.1.1.27
gotoModules (GOto - Gonicus Terminal Concept, value kernel modules.) - 1.3.6.1.4.1.10098.1.1.1.32
gotoXMouseButtons (GOto - Gonicus Terminal Concept, value xMouseButtons.) - 1.3.6.1.4.1.10098.1.1.1.23
fdIdGenerator (FusionDirectory - An automatic way to generate new user ids) - 1.3.6.1.4.1.38414.8.12.4
fdVoicemailContexts (FusionDirectory - available voicemail contexts) - 1.3.6.1.4.1.38414.19.11.2
ghScsiDev (Hardware definitions, value scsiDev) - 1.3.6.1.4.1.10098.1.1.2.5
goFonAdmin (Admin user for fon server) - 1.3.6.1.4.1.10098.1.1.9.26
ghGfxAdapter (Hardware definitions, value Grafikkarte) - 1.3.6.1.4.1.10098.1.1.2.9
fdPasswordHook (FusionDirectory - Password hook (external command)) - 1.3.6.1.4.1.38414.8.13.4
gotoXKbModel (GOto - Gonicus Terminal Concept, value xKbmodel.) - 1.3.6.1.4.1.10098.1.1.1.25
gotoRootPasswd (GOto - Gonicus Terminal Concept, value rootPasswd.) - 1.3.6.1.4.1.10098.1.1.1.14
goLogDB (GOsa logging DB name) - 1.3.6.1.4.1.10098.1.1.9.83
goLogAdmin (Admin user for log server) - 1.3.6.1.4.1.10098.1.1.9.24
gotoXResolution (GOto - Gonicus Terminal Concept, value xResolution.) - 1.3.6.1.4.1.10098.1.1.1.20
gotoScannerClients (GOto - Gonicus Terminal Concept, value scannerClients.) - 1.3.6.1.4.1.10098.1.1.1.11
gotoFontPath (GOto - Gonicus Terminal Concept, value fontPath.) - 1.3.6.1.4.1.10098.1.1.1.5
goFonPassword (Admin password for fon server) - 1.3.6.1.4.1.10098.1.1.9.27
Deprecated objectClasses:
goNfsServer (NFS server description) - 1.3.6.1.4.1.10098.1.2.1.19
goCupsServer (CUPS server description) - 1.3.6.1.4.1.10098.1.2.1.23
gosaCacheEntry (GOsa - Class for GOsa caching) - 1.3.6.1.4.1.10098.1.2.1.19.3
gosaObject (GOsa - Class for GOsa settings) - 1.3.6.1.4.1.10098.1.2.1.19.1
goFaxServer (Fax server description) - 1.3.6.1.4.1.10098.1.2.1.26
goFonServer (Fon server description) - 1.3.6.1.4.1.10098.1.2.1.29
gosaUserTemplate (GOsa - Class for GOsa User Templates) - 1.3.6.1.4.1.10098.1.2.1.19.11
gosaAccount (GOsa - Class for GOsa Accounts) - 1.3.6.1.4.1.10098.1.2.1.19.6
goLogDBServer (Log DB server description) - 1.3.6.1.4.1.10098.1.2.1.28
goSyslogServer (Syslog server description) - 1.3.6.1.4.1.10098.1.2.1.21
goNtpServer (Time server description) - 1.3.6.1.4.1.10098.1.2.1.20

fusiondirectory-setup --check-deprecated will output a list of dn using old attributes and objectClasses of they are present in your ldap server

fusiondirectory-setup --check-deprecated
List LDAP entries using deprecated attributes or objectclasses
There are no entries in the LDAP using obsolete attributes
There are no entries in the LDAP using obsolete classes

fusiondirectory-setup --ldif-deprecated will output an ldif file on the console that you can use with ldapmodify to clean you ldap server from old attributes.

If they are old objectClasses it will warn you and you will have to remove it by hand, they have been specified at the **fusiondirectory-setup --check-deprecated** step.

!! Please read it carefully before applying !!

---
* Further information

Expand Down
2 changes: 1 addition & 1 deletion contrib/man/fusiondirectory-insert-schema.1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "FUSIONDIRECTORY-INSERT-SCHEMA 1"
.TH FUSIONDIRECTORY-INSERT-SCHEMA 1 "2016-02-10" "FusionDirectory 1.0.10" "FusionDirectory Documentation"
.TH FUSIONDIRECTORY-INSERT-SCHEMA 1 "2016-03-02" "FusionDirectory 1.0.12" "FusionDirectory Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
Expand Down
5 changes: 4 additions & 1 deletion contrib/man/fusiondirectory-setup.1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "FUSIONDIRECTORY-SETUP 1"
.TH FUSIONDIRECTORY-SETUP 1 "2016-02-19" "FusionDirectory 1.0.10" "FusionDirectory Documentation"
.TH FUSIONDIRECTORY-SETUP 1 "2016-04-06" "FusionDirectory 1.0.12" "FusionDirectory Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
Expand Down Expand Up @@ -162,6 +162,9 @@ This option perform a check on FusionDirectory's config file.
.IP "\-\-check\-ldap" 4
.IX Item "--check-ldap"
This option check your \s-1LDAP\s0 tree. Looking for admin account, and groups or people branch. If one of those don't exists, the script will ask you what to do.
.IP "\-\-check\-ids" 4
.IX Item "--check-ids"
This option check your \s-1LDAP\s0 tree for duplicated uidNumber or gidNumber among users and groups.
.IP "\-\-migrate\-users" 4
.IX Item "--migrate-users"
This option add FusionDirectory attributes to the people branch.
Expand Down
2 changes: 1 addition & 1 deletion contrib/man/fusiondirectory.conf.5
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "FUSIONDIRECTORY.CONF 1"
.TH FUSIONDIRECTORY.CONF 1 "2016-02-10" "FusionDirectory 1.0.10" "FusionDirectory Documentation"
.TH FUSIONDIRECTORY.CONF 1 "2016-03-02" "FusionDirectory 1.0.12" "FusionDirectory Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
Expand Down
Binary file removed html/themes/default/icons/16/apps/antivirus.png
View file
Binary file not shown.
15 changes: 0 additions & 15 deletions include/class_config.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -470,22 +470,7 @@ class config {
return;
}

/* Fill imap servers */
$ldap = $this->get_ldap_link();
$ldap->cd ($this->current['BASE']);

/* Search mailMethod configuration in main section too */
$this->current['MAILMETHOD'] = $this->get_cfg_value("mailMethod", "");
$mailMethodClass = 'mailMethod'.$this->current['MAILMETHOD'];
if (class_available($mailMethodClass)) {
$this->data['SERVERS']['IMAP'] = $mailMethodClass::get_server_list($this);
} elseif (class_available('mailMethod')) {
msg_dialog::display(
_('Error'),
sprintf(_('The selected mail method (class %s) is not available'), $mailMethodClass),
ERROR_DIALOG
);
}

/* Get NFS server lists */
$tmp = array("default");
Expand Down
2 changes: 1 addition & 1 deletion include/class_plugin.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@ class plugin
$length = $args[0];
}
$res = '';
for ($i = 0; $i < $args[0]; ++$i) {
for ($i = 0; $i < $length; ++$i) {
switch ($chars) {
case 'l':
$res .= (string)rand(0, 9);
Expand Down
2 changes: 1 addition & 1 deletion include/class_session.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ class session {
*/
public static function global_delete($name)
{
if ($_SESSION[$name]) {
if (isset($_SESSION[$name])) {
unset($_SESSION[$name]);
}
}
Expand Down
Loading

0 comments on commit 4854b67

Please sign in to comment.