3 Commits

Author SHA1 Message Date
4e744a3212 * Tue Aug 13 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-8.sme
- ldif-fix filter string accepting only ascii [SME: 12720]
- fix logrotate does not fill new log [SME: 12673]
- fix prestart script logs to messages [SME: 12693]
2024-08-13 22:04:32 -04:00
092b156b80 * Wed Apr 17 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-7.sme
- fix ldap.init fails as starts before samba [SME: 12570]
2024-04-17 12:05:13 -04:00
John Crisp
6d144c3ea5 * Fri Apr 12 2024 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-6.sme
- Fix dropin file  [SME: 12610]
2024-04-12 15:26:45 +02:00
6 changed files with 23 additions and 8 deletions

View File

@@ -6,6 +6,6 @@
sharedscripts
postrotate
# OpenLDAP logs via syslog, restart syslog if running
/bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
/usr/bin/systemctl -s HUP kill rsyslog.service 2> /dev/null || true
endscript
}

View File

@@ -8,6 +8,8 @@ use Date::Parse;
use esmith::ConfigDB;
use esmith::AccountsDB;
use esmith::util;
use utf8;
use esmith::util::ldap;
use Getopt::Long qw(:config bundling);
$ENV{'PATH'} = '/bin:/usr/bin:/sbin:/usr/sbin';
@@ -97,8 +99,8 @@ foreach my $acct ($a->get('admin'), $a->users, $a->groups, $a->ibays, $a->get_al
push @{$data->{$dn}->{objectclass}}, 'inetOrgPerson';
$data->{$dn}->{mail} = "$key\@$domain";
@{$data->{$dn}}{qw/givenname sn telephonenumber o ou l street/} =
map { $acct->prop($_) || [] } qw/FirstName LastName Phone Company Dept City Street/;
$data->{$dn}->{cn} = $acct->prop('FirstName').' '.$acct->prop('LastName');
map { stringToASCII($acct->prop($_)) || [] } qw/FirstName LastName Phone Company Dept City Street/;
$data->{$dn}->{cn} = stringToASCII($acct->prop('FirstName').' '.$acct->prop('LastName'));
}
else {
push @{$data->{$dn}->{objectclass}}, 'account';

View File

@@ -1,6 +1,6 @@
[Unit]
Description=Koozali SME Server ldap.init
After=syslog.target network-online.target ldap.service
After=syslog.target network-online.target ldap.service smbd.service nmbd.service
[Service]
Type=forking

View File

@@ -21,6 +21,7 @@ TimeoutStartSec=300
Restart=always
ExecStopPost=/sbin/e-smith/systemd/ldap-finish
SyslogIdentifier=ldap
[Install]
WantedBy=sme-server.target

View File

@@ -1,6 +1,7 @@
[Service]
# disabled
# we are using ldap.service
ExecStart=
ExecStart=/usr/bin/true
ExecStartPre=
PIDFile=

View File

@@ -4,7 +4,7 @@ Summary: smeserver server and gateway - LDAP module
%define name smeserver-ldap
Name: %{name}
%define version 11.0.0
%define release 5
%define release 8
Version: %{version}
Release: %{release}%{?dist}
License: GPL
@@ -14,7 +14,7 @@ Source: %{name}-%{version}.tar.xz
BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
BuildArchitectures: noarch
Requires: smeserver-base
Requires: smeserver-lib >= 1.15.1-16
Requires: smeserver-lib >= 11.0.0-7
Requires: openldap >= 2.0.0
Requires: openldap-clients
Requires: openldap-servers
@@ -29,11 +29,22 @@ Provides: e-smith-ldap
smeserver server and gateway software - LDAP module.
%changelog
* Tue Aug 13 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-8.sme
- ldif-fix filter string accepting only ascii [SME: 12720]
- fix logrotate does not fill new log [SME: 12673]
- fix prestart script logs to messages [SME: 12693]
* Wed Apr 17 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-7.sme
- fix ldap.init fails as starts before samba [SME: 12570]
* Fri Apr 12 2024 John Crisp <jcrisp@safeandsoundit.co.uk> 11.0.0-6.sme
- Fix dropin file [SME: 12610]
* Sat Apr 06 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-5.sme
- drop rssh group reverting patch of 11753 [SME: 12510]
- drop rssh group reverting patch of 11753 [SME: 12510]
* Thu Apr 04 2024 Brian Read <brianr@koozali.org> 11.0.0-4.sme
- Update createlinks to create smeserver-package-update event[SME: 12579]
- Update createlinks to create smeserver-package-update event [SME: 12579]
* Thu Apr 04 2024 Brian Read <brianr@koozali.org> 11.0.0-3.sme
- Set license file to GPL2.0 [SME: 12577]