Compare commits
3 Commits
11_0_0-6_e
...
11_0_0-9_e
Author | SHA1 | Date | |
---|---|---|---|
aa58f53e33 | |||
4e744a3212 | |||
092b156b80 |
@@ -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
|
||||
}
|
||||
|
3
root/etc/tmpfiles.d/slapd.conf
Normal file
3
root/etc/tmpfiles.d/slapd.conf
Normal file
@@ -0,0 +1,3 @@
|
||||
# openldap runtime directory for slapd.arg and slapd.pid
|
||||
d /run/openldap 0755 ldap ldap -
|
||||
|
@@ -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';
|
||||
|
@@ -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
|
||||
|
@@ -21,6 +21,7 @@ TimeoutStartSec=300
|
||||
Restart=always
|
||||
|
||||
ExecStopPost=/sbin/e-smith/systemd/ldap-finish
|
||||
SyslogIdentifier=ldap
|
||||
|
||||
[Install]
|
||||
WantedBy=sme-server.target
|
||||
|
@@ -4,7 +4,7 @@ Summary: smeserver server and gateway - LDAP module
|
||||
%define name smeserver-ldap
|
||||
Name: %{name}
|
||||
%define version 11.0.0
|
||||
%define release 6
|
||||
%define release 9
|
||||
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,6 +29,18 @@ Provides: e-smith-ldap
|
||||
smeserver server and gateway software - LDAP module.
|
||||
|
||||
%changelog
|
||||
* Sun Sep 22 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-9.sme
|
||||
- el8 workaround to avoid noise with /var/run /run path [SME: 12619]
|
||||
/etc/tmpfiles.d/slapd.conf to remove when fixed upstream
|
||||
|
||||
* 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]
|
||||
|
||||
|
Reference in New Issue
Block a user