Projects
Kolab:16:Enterprise
kolab-autoconf
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 8
View file
kolab-autoconf.spec
Changed
@@ -15,24 +15,34 @@ %global httpd_name apache2 %global httpd_user wwwrun %else +%if 0%{?plesk} +%global httpd_group roundcube_sysgroup +%global httpd_name httpd +%global httpd_user roundcube_sysuser +%else %global httpd_group apache %global httpd_name httpd %global httpd_user apache %endif +%endif %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name} Name: kolab-autoconf -Version: 1.3 -Release: 2%{?dist} +Version: 1.3.1 +Release: 1%{?dist} Summary: Autodiscovery for clients of Kolab Groupware Group: Applications/Internet License: GPLv3+ URL: https://kolab.org + Source0: http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz +%if 0%{?plesk} < 1 Requires: php-kolab-net-ldap3 +%endif + Obsoletes: kolab-autodiscover < %{version}-%{release} Provides: kolab-autodiscover = %{version}-%{release} BuildArch: noarch @@ -57,20 +67,27 @@ ln -s ../../..%{_var}/log/%{name} logs popd +%if 0%{?plesk} < 1 %{__install} -pm 644 docs/%{name}.conf %{buildroot}/%{_ap_sysconfdir}/conf.d/%{name}.conf +%endif %files %defattr(-,root,root,-) %doc docs/* +%if 0%{?plesk} < 1 %dir %{_ap_sysconfdir} %dir %{_ap_sysconfdir}/conf.d %config(noreplace) %{_ap_sysconfdir}/conf.d/%{name}.conf +%endif %{_datadir}/%{name} %attr(0750,%{httpd_user},%{httpd_group}) %{_var}/log/%{name} %changelog -* Sat Dec 1 2018 Timotheus Pokorra <tp@tbits.net> - 1.3-2 -- require php-kolab-net-ldap3 because it was upgraded in EPEL +* Mon Mar 18 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 1.3.1-1 +- Release 1.3.1 + +* Wed Jun 27 2018 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.3.0-1 +- Release version 1.3.0 * Mon Oct 9 2017 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.3-1 - Release version 1.3
View file
debian.changelog
Changed
@@ -1,3 +1,27 @@ +kolab-autoconf (1.3.1-1) unstable; urgency=medium + + * Release of version 1.3.1. + + -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> Mon, 18 Mar 2019 16:24:02 +0100 + +kolab-autoconf (1.3.0-3) unstable; urgency=medium + + * Fix dependency - the Debian package is called php-net-ldap3 + + -- Christoph Erhardt <kolab@sicherha.de> Mon, 24 Sep 2018 08:30:49 +0200 + +kolab-autoconf (1.3.0-2) unstable; urgency=medium + + * Omit requiring php-kolab-net-ldap3 on systems that do not use LDAP + + -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> Wed, 4 Jul 2018 16:24:02 +0100 + +kolab-autoconf (1.3.0-1) unstable; urgency=medium + + * Adjust dependencies and build dependencies. + + -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> Wed, 27 Jun 2018 16:24:02 +0100 + kolab-autoconf (1.3-1) unstable; urgency=medium * Release of version 1.3.
View file
debian.control
Changed
@@ -2,7 +2,7 @@ Maintainer: André Keller <andre.keller@vshn.ch> Section: database Priority: optional -Build-Depends: debhelper (>=9.0.0) +Build-Depends: debhelper (>=9.0.0), psa | bash Standards-Version: 3.9.5 Package: kolab-autoconf
View file
debian.rules
Changed
@@ -1,4 +1,14 @@ #!/usr/bin/make -f +export DH_OPTIONS=-v +export DH_VERBOSE=1 + +override_dh_auto_install: + if ! -f "/etc/plesk-release" ; then \ + echo "misc:Depends=php-net-ldap3" >> $(CURDIR)/debian/kolab-autoconf.substvars ; \ + fi + + dh_auto_install + %: dh $@
View file
kolab-autoconf-1.3.tar.gz/lib/Autodiscover.php -> kolab-autoconf-1.3.1.tar.gz/lib/Autodiscover.php
Changed
@@ -169,7 +169,16 @@ protected function get_user($email, $domain) { // initialize LDAP connection - $this->ldap(); + $result = $this->init_ldap(); + + if (!$result) { + $this->config = array_merge( + $this->config, + Array('mail' => $email, 'domain' => $domain) + ); + + return; + } // find domain if (!$this->ldap->find_domain($domain)) { @@ -186,11 +195,17 @@ /** * Initialize LDAP connection */ - protected function ldap() + protected function init_ldap() { - $uri = parse_url($this->conf->get('ldap_uri')); + $ldap_uri = $this->conf->get('ldap_uri', false); + + if (!$ldap_uri) { + return false; + } + + $uri = parse_url($ldap_uri); - $this->_ldap_server = $uri'host'; + $this->_ldap_server = ($uri'scheme' === 'ldaps' ? 'ldaps://' : '') . $uri'host'; $this->_ldap_port = $uri'port'; $this->_ldap_scheme = $uri'scheme'; $this->_ldap_bind_dn = $this->conf->get('ldap', 'service_bind_dn');
View file
kolab-autoconf-1.3.tar.gz/lib/Conf.php -> kolab-autoconf-1.3.1.tar.gz/lib/Conf.php
Changed
@@ -54,6 +54,16 @@ { // Do some magic configuration loading here. if (!file_exists(self::CONFIG_FILE)) { + $this->_conf = Array( + 'autodiscover' => Array( + 'activesync' => '%d', + 'imap' => 'ssl://%d:993', + 'smtp' => 'ssl://%d:465', + 'service_name' => 'Kolab Groupware', + 'service_short' => 'Kolab', + ) + ); + return; } @@ -85,7 +95,7 @@ return (string) $value; } - public function get_list($key1, $key2 = NULL) + public function get_list($key1, $key2 = null) { $list = array(); $value = $this->get($key1, $key2); @@ -101,7 +111,7 @@ return $list; } - public function get_raw($key1, $key2 = NULL) + public function get_raw($key1, $key2 = null) { if (isset($this->_conf$key1)) { if ($key2) { @@ -144,7 +154,7 @@ return null; } - public function expand($str, $custom = FALSE) + public function expand($str, $custom = false) { if (preg_match_all('/%\((?P<variable>\w+)\)s/', $str, $matches)) { if (isset($matches'variable') && !empty($matches'variable')) {
View file
kolab-autoconf-1.3.tar.gz/lib/Log.php -> kolab-autoconf-1.3.1.tar.gz/lib/Log.php
Changed
@@ -173,7 +173,7 @@ } if (!empty($args)) { - $logline .= var_export($args, TRUE); + $logline .= var_export($args, true); } }
View file
kolab-autoconf.dsc
Changed
@@ -2,16 +2,16 @@ Source: kolab-autoconf Binary: kolab-autoconf Architecture: all -Version: 1.3-1 +Version: 1.3.1-1 Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Uploaders: Tobias Brunner <tobias.brunner@vshn.ch> Homepage: http://www.kolab.org/ Standards-Version: 3.9.3 Vcs-Browser: http://git.kolabsys.com/apt/kolab-autoconf/ Vcs-Git: git://git.kolabsys.com/git/apt/kolab-autoconf -Build-Depends: debhelper (>= 8) +Build-Depends: debhelper (>= 8), psa | bash Package-List: kolab-autoconf deb admin extra Files: - 00000000000000000000000000000000 0 kolab-autoconf-1.3.tar.gz + 00000000000000000000000000000000 0 kolab-autoconf-1.3.1.tar.gz 00000000000000000000000000000000 0 debian.tar.gz
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.