From db7ace62f36d80e9439120f27bf1f7213c7fd216 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 23 Aug 2017 10:31:45 -0400 Subject: [PATCH 01/22] Lib dependencies --- Dockerfile | 2 +- java/sync/debian/control | 6 +++--- java/tomcat/debian/control | 2 +- ui/debian/control | 12 ++++++------ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 497df4ac72..312b55abfd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,7 +35,7 @@ ADD . obm ## BUILD OBM PACKAGES RUN cd obm/java/sync && \ mvn dependency:go-offline || true && \ - mvn package -T1C + mvn package -DskipTests -T1C RUN cd obm/build-system && \ ./build.py /root/build-deb --nocompile --osversion wheezy all && \ diff --git a/java/sync/debian/control b/java/sync/debian/control index 1d8822718b..7662b8b7e2 100644 --- a/java/sync/debian/control +++ b/java/sync/debian/control @@ -20,7 +20,7 @@ Description: synchronization application for Open Business Management Package: obm-locator Architecture: all -Depends: openjdk-7-jre-headless, obm-conf (= ${binary:Version}), openssl +Depends: openjdk-8-jre-headless, obm-conf (= ${binary:Version}), openssl Description: Locator for Open Business Management This package is a J2E web service, which allows can be queried to retrieve the location of an OBM component. @@ -32,7 +32,7 @@ Description: Locator for Open Business Management Package: obm-provisioning Architecture: all -Depends: openjdk-7-jre-headless, obm-conf (= ${binary:Version}) +Depends: openjdk-8-jre-headless, obm-conf (= ${binary:Version}) Description: Provisioning API for Open Business Management This package is an HTTP web service, which can be queried to provision an OBM server. @@ -68,7 +68,7 @@ Description: Tomcat common libs for Open Business Management Package: obm-imap-archive Architecture: all -Depends: openjdk-7-jre-headless, obm-conf (= ${binary:Version}) +Depends: openjdk-8-jre-headless, obm-conf (= ${binary:Version}) Description: OBM component that perform email archiving obm-imap-archive is a http server exposing webservices to perform email archiving. . diff --git a/java/tomcat/debian/control b/java/tomcat/debian/control index 75f8dec1cf..16ea2bb284 100644 --- a/java/tomcat/debian/control +++ b/java/tomcat/debian/control @@ -10,7 +10,7 @@ Homepage: http://www.obm.org Package: obm-tomcat Architecture: all -Depends: openjdk-7-jre-headless, libapr1, ${misc:Depends} +Depends: openjdk-8-jre-headless, libapr1, ${misc:Depends} Description: the Tomcat web application server for Open Business Management This package contains the 6.0.20 version of the Apache Tomcat application server for OBM. diff --git a/ui/debian/control b/ui/debian/control index 9f5b9ea468..5fb3ea25f5 100644 --- a/ui/debian/control +++ b/ui/debian/control @@ -46,7 +46,7 @@ Description: configuration system for Open Business Management Package: obm-storage Architecture: all -Pre-Depends: obm-core (= ${binary:Version}), dbconfig-common, obm-conf (= ${binary:Version}), postgresql-8.3 | postgresql-8.4 | postgresql-9.1 | mysql-server +Pre-Depends: obm-core (= ${binary:Version}), dbconfig-common, obm-conf (= ${binary:Version}), postgresql-8.3 | postgresql-8.4 | postgresql-9.1 | postgresql-9.6 |mysql-server Depends: obm-locator, ${misc:Depends} Description: database for Open Business Management This package initializes the OBM database, which can be either Postgres or @@ -62,7 +62,7 @@ Description: database for Open Business Management Package: obm-core Architecture: all Pre-Depends: debconf -Depends: obm-conf (= ${binary:Version}), php5-cli, php5-pgsql | php5-mysql, tzdata, php5-curl, php-apc, ${misc:Depends} +Depends: obm-conf (= ${binary:Version}), php-cli, php-pgsql | php-mysql, tzdata, php-curl, php-apc | php-apcu, ${misc:Depends} Conflicts: opush (<< 3) Description: web interface for Open Business Management This package contains the web interface for OBM. It has no dependency on the @@ -87,8 +87,8 @@ Description: certificate generation for OBM Package: obm-ui Architecture: all -Depends: obm-core (= ${binary:Version}), obm-certs (= ${binary:Version}), php5, apache2, libapache2-mod-php5, php5-pgsql | php5-mysql, php5-gd, php5-imap, php-db, php5-ldap, ${misc:Depends} -Recommends: php5-imagick +Depends: obm-core (= ${binary:Version}), obm-certs (= ${binary:Version}), php, apache2, libapache2-mod-php, php-pgsql | php-mysql, php-gd, php-imap, php-db, php-ldap, ${misc:Depends} +Recommends: php-imagick Description: web interface configuration for OBM This package configures Apache to serve OBM components (obm-ui, obm-storage). . @@ -100,7 +100,7 @@ Description: web interface configuration for OBM Package: libobm-perl Section: perl Architecture: all -Depends: libnet-telnet-perl, libcyrus-imap-perl23|libcyrus-imap-perl22, libnet-server-perl, libcrypt-smbhash-perl, libunicode-maputf8-perl, libconfig-inifiles-perl, libnet-ldap-perl, libclass-singleton-perl, libdbi-perl, libdbd-pg-perl | libdbd-mysql-perl, libsasl2-modules, libio-socket-ssl-perl, libxml-simple-perl, liblog-log4perl-perl, ${perl:Depends}, ${misc:Depends} +Depends: libnet-telnet-perl, libcyrus-imap-perl23|libcyrus-imap-perl22|libcyrus-imap-perl, libnet-server-perl, libcrypt-smbhash-perl, libunicode-maputf8-perl, libconfig-inifiles-perl, libnet-ldap-perl, libclass-singleton-perl, libdbi-perl, libdbd-pg-perl | libdbd-mysql-perl, libsasl2-modules, libio-socket-ssl-perl, libxml-simple-perl, liblog-log4perl-perl, ${perl:Depends}, ${misc:Depends} Description: library for the integration of OBM with LDAP/Postfix/Cyrus This package contains the library used by obm-services to interact with LDAP, Postfix and Cyrus. @@ -136,7 +136,7 @@ Description: LDAP configuration for OBM Package: obm-cyrus Architecture: all Pre-depends: obm-satellite -Depends: obm-conf (= ${binary:Version}), cyrus-common-2.4|cyrus-common-2.3|cyrus-common-2.2, cyrus-admin-2.4|cyrus-admin-2.3|cyrus-admin-2.2, cyrus-imapd-2.4|cyrus-imapd-2.3|cyrus-imapd-2.2, cyrus-pop3d-2.4|cyrus-pop3d-2.3|cyrus-pop3d-2.2, cyrus-sasl2-dbg, cyrus-sasl2-doc, cyrus-clients-2.4|cyrus-clients-2.3|cyrus-clients-2.2, sasl2-bin, libsasl2|libsasl2-2, libsasl2-modules, ${misc:Depends} +Depends: obm-conf (= ${binary:Version}), cyrus-common-2.4|cyrus-common-2.3|cyrus-common-2.2|cyrus-common, cyrus-admin-2.4|cyrus-admin-2.3|cyrus-admin-2.2|cyrus-admin, cyrus-imapd-2.4|cyrus-imapd-2.3|cyrus-imapd-2.2|cyrus-imapd, cyrus-pop3d-2.4|cyrus-pop3d-2.3|cyrus-pop3d-2.2|cyrus-pop3d, cyrus-sasl2-dbg|sasl2-bin, cyrus-sasl2-doc, cyrus-clients-2.4|cyrus-clients-2.3|cyrus-clients-2.2|cyrus-clients, sasl2-bin, libsasl2|libsasl2-2, libsasl2-modules, ${misc:Depends} Description: Cyrus/SASL configuration for OBM This package configures Cyrus/SASL for OBM. . From bfccaa22a3dfa024a28706dcaf39a1d6caddc3f0 Mon Sep 17 00:00:00 2001 From: Jeremy Carnus Date: Wed, 23 Aug 2017 10:37:10 -0400 Subject: [PATCH 02/22] Added insserv dependency --- java/sync/debian/control | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/sync/debian/control b/java/sync/debian/control index 7662b8b7e2..3dd5a9e707 100644 --- a/java/sync/debian/control +++ b/java/sync/debian/control @@ -2,7 +2,7 @@ Source: obm-java Section: net Priority: optional Maintainer: Thomas Sarboni -Build-Depends: cdbs, maven, debhelper (>= 5.0), openjdk-7-jdk +Build-Depends: cdbs, maven, debhelper (>= 5.0), openjdk-8-jdk Standards-Version: 3.8.3 Homepage: http://www.obm.org @@ -20,7 +20,7 @@ Description: synchronization application for Open Business Management Package: obm-locator Architecture: all -Depends: openjdk-8-jre-headless, obm-conf (= ${binary:Version}), openssl +Depends: openjdk-8-jre-headless, obm-conf (= ${binary:Version}), openssl, insserv Description: Locator for Open Business Management This package is a J2E web service, which allows can be queried to retrieve the location of an OBM component. From cc4602f56d7e281d88e68db3b23287224de77d86 Mon Sep 17 00:00:00 2001 From: Jeremy Carnus Date: Thu, 24 Aug 2017 08:59:57 -0400 Subject: [PATCH 03/22] "Remove old php script tag" --- ui/conf/hooks/user/mailchooser.inc.sample | 1 - ui/conf/obm_conf.inc.sample | 2 +- ui/conf/webmail.inc.php.sample | 2 +- ui/obminclude/global_pref.inc | 2 +- ui/obminclude/javascript/category_js.inc | 4 ++-- ui/obminclude/javascript/check_js.inc | 4 ++-- ui/obminclude/lang/en/account.inc | 2 +- ui/obminclude/lang/en/admin.inc | 2 +- ui/obminclude/lang/en/admin_code.inc | 2 +- ui/obminclude/lang/en/admin_data.inc | 2 +- ui/obminclude/lang/en/admin_lang.inc | 2 +- ui/obminclude/lang/en/admin_pref.inc | 2 +- ui/obminclude/lang/en/admin_ref.inc | 2 +- ui/obminclude/lang/en/backup.inc | 2 +- ui/obminclude/lang/en/campaign.inc | 2 +- ui/obminclude/lang/en/check_date_js.inc | 2 +- ui/obminclude/lang/en/company.inc | 2 +- ui/obminclude/lang/en/contact.inc | 2 +- ui/obminclude/lang/en/contract.inc | 2 +- ui/obminclude/lang/en/control.inc | 2 +- ui/obminclude/lang/en/deal.inc | 2 +- ui/obminclude/lang/en/document.inc | 2 +- ui/obminclude/lang/en/domain.inc | 2 +- ui/obminclude/lang/en/exportcsv.inc | 2 +- ui/obminclude/lang/en/global.inc | 2 +- ui/obminclude/lang/en/group.inc | 2 +- ui/obminclude/lang/en/host.inc | 2 +- ui/obminclude/lang/en/imap_archive.inc | 2 +- ui/obminclude/lang/en/import.inc | 2 +- ui/obminclude/lang/en/incident.inc | 2 +- ui/obminclude/lang/en/invoice.inc | 2 +- ui/obminclude/lang/en/lead.inc | 2 +- ui/obminclude/lang/en/list.inc | 2 +- ui/obminclude/lang/en/mailbox.inc | 2 +- ui/obminclude/lang/en/mailforward.inc | 2 +- ui/obminclude/lang/en/mailshare.inc | 2 +- ui/obminclude/lang/en/password.inc | 2 +- ui/obminclude/lang/en/payment.inc | 2 +- ui/obminclude/lang/en/people.inc | 2 +- ui/obminclude/lang/en/planning.inc | 2 +- ui/obminclude/lang/en/profile.inc | 2 +- ui/obminclude/lang/en/project.inc | 2 +- ui/obminclude/lang/en/publication.inc | 2 +- ui/obminclude/lang/en/report.inc | 2 +- ui/obminclude/lang/en/resource.inc | 2 +- ui/obminclude/lang/en/resourcegroup.inc | 2 +- ui/obminclude/lang/en/samba.inc | 2 +- ui/obminclude/lang/en/settings.inc | 2 +- ui/obminclude/lang/en/statistic.inc | 2 +- ui/obminclude/lang/en/time.inc | 2 +- ui/obminclude/lang/en/todo.inc | 2 +- ui/obminclude/lang/en/tools.inc | 2 +- ui/obminclude/lang/en/user.inc | 2 +- ui/obminclude/lang/en/userpattern.inc | 2 +- ui/obminclude/lang/en/vacation.inc | 2 +- ui/obminclude/lang/fr/account.inc | 2 +- ui/obminclude/lang/fr/admin.inc | 2 +- ui/obminclude/lang/fr/admin_code.inc | 2 +- ui/obminclude/lang/fr/admin_data.inc | 2 +- ui/obminclude/lang/fr/admin_lang.inc | 2 +- ui/obminclude/lang/fr/admin_pref.inc | 2 +- ui/obminclude/lang/fr/admin_ref.inc | 2 +- ui/obminclude/lang/fr/backup.inc | 2 +- ui/obminclude/lang/fr/campaign.inc | 2 +- ui/obminclude/lang/fr/check_date_js.inc | 2 +- ui/obminclude/lang/fr/company.inc | 2 +- ui/obminclude/lang/fr/contact.inc | 2 +- ui/obminclude/lang/fr/contract.inc | 2 +- ui/obminclude/lang/fr/control.inc | 2 +- ui/obminclude/lang/fr/deal.inc | 2 +- ui/obminclude/lang/fr/document.inc | 2 +- ui/obminclude/lang/fr/domain.inc | 2 +- ui/obminclude/lang/fr/exportcsv.inc | 2 +- ui/obminclude/lang/fr/global.inc | 2 +- ui/obminclude/lang/fr/group.inc | 2 +- ui/obminclude/lang/fr/host.inc | 2 +- ui/obminclude/lang/fr/imap_archive.inc | 2 +- ui/obminclude/lang/fr/import.inc | 2 +- ui/obminclude/lang/fr/incident.inc | 2 +- ui/obminclude/lang/fr/invoice.inc | 2 +- ui/obminclude/lang/fr/lead.inc | 2 +- ui/obminclude/lang/fr/list.inc | 2 +- ui/obminclude/lang/fr/mailbox.inc | 2 +- ui/obminclude/lang/fr/mailforward.inc | 2 +- ui/obminclude/lang/fr/mailshare.inc | 2 +- ui/obminclude/lang/fr/password.inc | 2 +- ui/obminclude/lang/fr/payment.inc | 2 +- ui/obminclude/lang/fr/people.inc | 2 +- ui/obminclude/lang/fr/planning.inc | 2 +- ui/obminclude/lang/fr/profile.inc | 2 +- ui/obminclude/lang/fr/project.inc | 2 +- ui/obminclude/lang/fr/publication.inc | 2 +- ui/obminclude/lang/fr/report.inc | 2 +- ui/obminclude/lang/fr/resource.inc | 2 +- ui/obminclude/lang/fr/resourcegroup.inc | 2 +- ui/obminclude/lang/fr/samba.inc | 2 +- ui/obminclude/lang/fr/settings.inc | 2 +- ui/obminclude/lang/fr/statistic.inc | 2 +- ui/obminclude/lang/fr/time.inc | 2 +- ui/obminclude/lang/fr/todo.inc | 2 +- ui/obminclude/lang/fr/tools.inc | 2 +- ui/obminclude/lang/fr/user.inc | 2 +- ui/obminclude/lang/fr/userpattern.inc | 2 +- ui/obminclude/lang/fr/vacation.inc | 2 +- ui/obminclude/lang/vi/account.inc | 2 +- ui/obminclude/lang/vi/admin.inc | 2 +- ui/obminclude/lang/vi/admin_code.inc | 2 +- ui/obminclude/lang/vi/admin_data.inc | 2 +- ui/obminclude/lang/vi/admin_lang.inc | 2 +- ui/obminclude/lang/vi/admin_pref.inc | 2 +- ui/obminclude/lang/vi/admin_ref.inc | 2 +- ui/obminclude/lang/vi/backup.inc | 2 +- ui/obminclude/lang/vi/campaign.inc | 2 +- ui/obminclude/lang/vi/check_date_js.inc | 2 +- ui/obminclude/lang/vi/company.inc | 2 +- ui/obminclude/lang/vi/contact.inc | 2 +- ui/obminclude/lang/vi/contract.inc | 2 +- ui/obminclude/lang/vi/control.inc | 2 +- ui/obminclude/lang/vi/deal.inc | 2 +- ui/obminclude/lang/vi/document.inc | 2 +- ui/obminclude/lang/vi/domain.inc | 2 +- ui/obminclude/lang/vi/exportcsv.inc | 2 +- ui/obminclude/lang/vi/global.inc | 2 +- ui/obminclude/lang/vi/group.inc | 2 +- ui/obminclude/lang/vi/host.inc | 2 +- ui/obminclude/lang/vi/imap_archive.inc | 2 +- ui/obminclude/lang/vi/import.inc | 2 +- ui/obminclude/lang/vi/importb.inc | 2 +- ui/obminclude/lang/vi/incident.inc | 2 +- ui/obminclude/lang/vi/invoice.inc | 2 +- ui/obminclude/lang/vi/lead.inc | 2 +- ui/obminclude/lang/vi/list.inc | 2 +- ui/obminclude/lang/vi/mailbox.inc | 2 +- ui/obminclude/lang/vi/mailforward.inc | 2 +- ui/obminclude/lang/vi/mailshare.inc | 2 +- ui/obminclude/lang/vi/password.inc | 2 +- ui/obminclude/lang/vi/payment.inc | 2 +- ui/obminclude/lang/vi/people.inc | 2 +- ui/obminclude/lang/vi/planning.inc | 2 +- ui/obminclude/lang/vi/profile.inc | 2 +- ui/obminclude/lang/vi/project.inc | 2 +- ui/obminclude/lang/vi/publication.inc | 2 +- ui/obminclude/lang/vi/report.inc | 2 +- ui/obminclude/lang/vi/resource.inc | 2 +- ui/obminclude/lang/vi/resourcegroup.inc | 2 +- ui/obminclude/lang/vi/samba.inc | 2 +- ui/obminclude/lang/vi/settings.inc | 2 +- ui/obminclude/lang/vi/statistic.inc | 2 +- ui/obminclude/lang/vi/time.inc | 2 +- ui/obminclude/lang/vi/todo.inc | 2 +- ui/obminclude/lang/vi/tools.inc | 2 +- ui/obminclude/lang/vi/user.inc | 2 +- ui/obminclude/lang/vi/userpattern.inc | 2 +- ui/obminclude/lang/vi/vacation.inc | 2 +- ui/obminclude/lang/zh/account.inc | 2 +- ui/obminclude/lang/zh/admin.inc | 2 +- ui/obminclude/lang/zh/admin_code.inc | 2 +- ui/obminclude/lang/zh/admin_data.inc | 2 +- ui/obminclude/lang/zh/admin_lang.inc | 2 +- ui/obminclude/lang/zh/admin_pref.inc | 2 +- ui/obminclude/lang/zh/admin_ref.inc | 2 +- ui/obminclude/lang/zh/backup.inc | 2 +- ui/obminclude/lang/zh/campaign.inc | 2 +- ui/obminclude/lang/zh/check_date_js.inc | 2 +- ui/obminclude/lang/zh/company.inc | 2 +- ui/obminclude/lang/zh/contact.inc | 2 +- ui/obminclude/lang/zh/contract.inc | 2 +- ui/obminclude/lang/zh/control.inc | 2 +- ui/obminclude/lang/zh/deal.inc | 2 +- ui/obminclude/lang/zh/document.inc | 2 +- ui/obminclude/lang/zh/domain.inc | 2 +- ui/obminclude/lang/zh/exportcsv.inc | 2 +- ui/obminclude/lang/zh/global.inc | 2 +- ui/obminclude/lang/zh/group.inc | 2 +- ui/obminclude/lang/zh/host.inc | 2 +- ui/obminclude/lang/zh/imap_archive.inc | 2 +- ui/obminclude/lang/zh/import.inc | 2 +- ui/obminclude/lang/zh/incident.inc | 2 +- ui/obminclude/lang/zh/invoice.inc | 2 +- ui/obminclude/lang/zh/lead.inc | 2 +- ui/obminclude/lang/zh/list.inc | 2 +- ui/obminclude/lang/zh/mailbox.inc | 2 +- ui/obminclude/lang/zh/mailforward.inc | 2 +- ui/obminclude/lang/zh/mailshare.inc | 2 +- ui/obminclude/lang/zh/password.inc | 2 +- ui/obminclude/lang/zh/payment.inc | 2 +- ui/obminclude/lang/zh/people.inc | 2 +- ui/obminclude/lang/zh/planning.inc | 2 +- ui/obminclude/lang/zh/profile.inc | 2 +- ui/obminclude/lang/zh/project.inc | 2 +- ui/obminclude/lang/zh/publication.inc | 2 +- ui/obminclude/lang/zh/report.inc | 2 +- ui/obminclude/lang/zh/resource.inc | 2 +- ui/obminclude/lang/zh/resourcegroup.inc | 2 +- ui/obminclude/lang/zh/samba.inc | 2 +- ui/obminclude/lang/zh/settings.inc | 2 +- ui/obminclude/lang/zh/statistic.inc | 2 +- ui/obminclude/lang/zh/time.inc | 2 +- ui/obminclude/lang/zh/todo.inc | 2 +- ui/obminclude/lang/zh/tools.inc | 2 +- ui/obminclude/lang/zh/user.inc | 2 +- ui/obminclude/lang/zh/userpattern.inc | 2 +- ui/obminclude/lang/zh/vacation.inc | 2 +- ui/obminclude/login.inc | 4 ++-- ui/obminclude/of/of_session.inc | 4 ++-- ui/obminclude/phplib/obmlib.inc | 4 ++-- ui/php/account/account_js.inc | 2 +- ui/php/control/control_display.inc | 4 ++-- ui/php/control/control_index.php | 4 ++-- ui/php/control/control_query.inc | 4 ++-- ui/php/host/host_index.php | 4 ++-- ui/php/host/host_js.inc | 4 ++-- ui/php/mailbox/mailbox_display.inc | 4 ++-- ui/php/mailbox/mailbox_index.php | 4 ++-- ui/php/mailbox/mailbox_query.inc | 4 ++-- ui/php/mailforward/mailforward_index.php | 4 ++-- ui/php/mailshare/mailshare_index.php | 4 ++-- ui/php/mailshare/mailshare_js.inc | 4 ++-- ui/php/obm.php | 2 +- ui/php/obm_query.inc | 4 ++-- ui/php/password/password_display.inc | 4 ++-- ui/php/password/password_index.php | 4 ++-- ui/php/password/password_query.inc | 2 +- ui/php/planning/planning_display.inc | 2 +- ui/php/planning/planning_index.php | 2 +- ui/php/planning/planning_query.inc | 4 ++-- ui/php/report/report_display.inc | 4 ++-- ui/php/report/report_index.php | 4 ++-- ui/php/samba/samba_display.inc | 4 ++-- ui/php/samba/samba_index.php | 4 ++-- ui/php/samba/samba_query.inc | 4 ++-- ui/php/tools/tools_index.php | 4 ++-- ui/php/vacation/vacation_display.inc | 4 ++-- ui/php/vacation/vacation_index.php | 4 ++-- ui/php/vacation/vacation_js.inc | 2 +- ui/php/vacation/vacation_query.inc | 4 ++-- ui/resources/themes/default/theme.inc | 2 +- ui/resources/themes/oldschool/theme.inc | 2 +- ui/scripts/2.2/update22/obminclude/global.inc | 4 ++-- ui/scripts/2.2/update22/obminclude/of/of_session.inc | 4 ++-- ui/scripts/2.2/update22/obminclude/phplib/obmlib.inc | 4 ++-- ui/scripts/2.2/update22/scripts/2.2/update-2.1-2.2.php | 2 +- ui/tests/global_test.inc | 4 ++-- ui/tests/test-list.php | 4 ++-- 244 files changed, 277 insertions(+), 278 deletions(-) diff --git a/ui/conf/hooks/user/mailchooser.inc.sample b/ui/conf/hooks/user/mailchooser.inc.sample index 47ba9aa5a5..d6878ab119 100644 --- a/ui/conf/hooks/user/mailchooser.inc.sample +++ b/ui/conf/hooks/user/mailchooser.inc.sample @@ -1,4 +1,3 @@ - + + + + +?> diff --git a/ui/obminclude/javascript/check_js.inc b/ui/obminclude/javascript/check_js.inc index 30f3dfebdf..2d5e006ee0 100644 --- a/ui/obminclude/javascript/check_js.inc +++ b/ui/obminclude/javascript/check_js.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/obminclude/lang/en/account.inc b/ui/obminclude/lang/en/account.inc index a7e5569118..db72bae41e 100644 --- a/ui/obminclude/lang/en/account.inc +++ b/ui/obminclude/lang/en/account.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/obminclude/of/of_session.inc b/ui/obminclude/of/of_session.inc index 6a3c2f5e2a..fb1fac7d80 100644 --- a/ui/obminclude/of/of_session.inc +++ b/ui/obminclude/of/of_session.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/obminclude/phplib/obmlib.inc b/ui/obminclude/phplib/obmlib.inc index 0ac2c4afd0..0dd3007c2d 100644 --- a/ui/obminclude/phplib/obmlib.inc +++ b/ui/obminclude/phplib/obmlib.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/php/account/account_js.inc b/ui/php/account/account_js.inc index c10debb83a..c1abcc5c64 100644 --- a/ui/php/account/account_js.inc +++ b/ui/php/account/account_js.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/php/control/control_index.php b/ui/php/control/control_index.php index 8ed372e702..4a9673c1bb 100644 --- a/ui/php/control/control_index.php +++ b/ui/php/control/control_index.php @@ -1,4 +1,4 @@ - +?> diff --git a/ui/php/control/control_query.inc b/ui/php/control/control_query.inc index 2b5f940b4b..0558f66437 100644 --- a/ui/php/control/control_query.inc +++ b/ui/php/control/control_query.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/php/host/host_index.php b/ui/php/host/host_index.php index 103542963c..7f8df63a7e 100644 --- a/ui/php/host/host_index.php +++ b/ui/php/host/host_index.php @@ -31,7 +31,7 @@ ?> - +?> diff --git a/ui/php/host/host_js.inc b/ui/php/host/host_js.inc index 233d805af0..66f7cf486b 100644 --- a/ui/php/host/host_js.inc +++ b/ui/php/host/host_js.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/php/mailbox/mailbox_display.inc b/ui/php/mailbox/mailbox_display.inc index 9dacfc389c..80e6f9f559 100644 --- a/ui/php/mailbox/mailbox_display.inc +++ b/ui/php/mailbox/mailbox_display.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/php/mailbox/mailbox_index.php b/ui/php/mailbox/mailbox_index.php index b6219c8038..2bc5842114 100644 --- a/ui/php/mailbox/mailbox_index.php +++ b/ui/php/mailbox/mailbox_index.php @@ -31,7 +31,7 @@ ?> - +?> diff --git a/ui/php/mailbox/mailbox_query.inc b/ui/php/mailbox/mailbox_query.inc index d5407470cc..3364ecac88 100644 --- a/ui/php/mailbox/mailbox_query.inc +++ b/ui/php/mailbox/mailbox_query.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/php/mailforward/mailforward_index.php b/ui/php/mailforward/mailforward_index.php index 2abb8b53a8..0a9c268b45 100644 --- a/ui/php/mailforward/mailforward_index.php +++ b/ui/php/mailforward/mailforward_index.php @@ -31,7 +31,7 @@ ?> - +?> diff --git a/ui/php/mailshare/mailshare_index.php b/ui/php/mailshare/mailshare_index.php index 607531bffc..c864cbb5e1 100644 --- a/ui/php/mailshare/mailshare_index.php +++ b/ui/php/mailshare/mailshare_index.php @@ -31,7 +31,7 @@ ?> - +?> diff --git a/ui/php/mailshare/mailshare_js.inc b/ui/php/mailshare/mailshare_js.inc index 797c673565..1aa6172d0c 100644 --- a/ui/php/mailshare/mailshare_js.inc +++ b/ui/php/mailshare/mailshare_js.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/php/obm.php b/ui/php/obm.php index f43205eef0..695b482b44 100644 --- a/ui/php/obm.php +++ b/ui/php/obm.php @@ -31,7 +31,7 @@ ?> - +?> diff --git a/ui/php/password/password_display.inc b/ui/php/password/password_display.inc index 7504ce6dd7..9f016ce938 100644 --- a/ui/php/password/password_display.inc +++ b/ui/php/password/password_display.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/php/password/password_index.php b/ui/php/password/password_index.php index ff17425fb8..02994b2e75 100644 --- a/ui/php/password/password_index.php +++ b/ui/php/password/password_index.php @@ -31,7 +31,7 @@ ?> - +?> diff --git a/ui/php/password/password_query.inc b/ui/php/password/password_query.inc index 5df36cf5c7..f7d67a34e6 100644 --- a/ui/php/password/password_query.inc +++ b/ui/php/password/password_query.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/php/report/report_display.inc b/ui/php/report/report_display.inc index fe9ff33971..76ef5af773 100644 --- a/ui/php/report/report_display.inc +++ b/ui/php/report/report_display.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/php/report/report_index.php b/ui/php/report/report_index.php index 0c51e74b1b..dc4a590681 100644 --- a/ui/php/report/report_index.php +++ b/ui/php/report/report_index.php @@ -31,7 +31,7 @@ ?> - +?> diff --git a/ui/php/samba/samba_display.inc b/ui/php/samba/samba_display.inc index f348b1131b..6e647286e6 100644 --- a/ui/php/samba/samba_display.inc +++ b/ui/php/samba/samba_display.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/php/samba/samba_index.php b/ui/php/samba/samba_index.php index 0a58a9303a..9ed484242e 100644 --- a/ui/php/samba/samba_index.php +++ b/ui/php/samba/samba_index.php @@ -31,7 +31,7 @@ ?> - +?> diff --git a/ui/php/samba/samba_query.inc b/ui/php/samba/samba_query.inc index ddd68b749c..082ff9f205 100644 --- a/ui/php/samba/samba_query.inc +++ b/ui/php/samba/samba_query.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/php/tools/tools_index.php b/ui/php/tools/tools_index.php index d2b5f78660..5150477bd3 100644 --- a/ui/php/tools/tools_index.php +++ b/ui/php/tools/tools_index.php @@ -31,7 +31,7 @@ ?> - +?> diff --git a/ui/php/vacation/vacation_display.inc b/ui/php/vacation/vacation_display.inc index 9fcfb15858..82b2277dad 100644 --- a/ui/php/vacation/vacation_display.inc +++ b/ui/php/vacation/vacation_display.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/php/vacation/vacation_index.php b/ui/php/vacation/vacation_index.php index 68202d10f3..3c7f7a0328 100644 --- a/ui/php/vacation/vacation_index.php +++ b/ui/php/vacation/vacation_index.php @@ -32,7 +32,7 @@ ?> - +?> diff --git a/ui/php/vacation/vacation_js.inc b/ui/php/vacation/vacation_js.inc index f13526f5cb..2183702c70 100644 --- a/ui/php/vacation/vacation_js.inc +++ b/ui/php/vacation/vacation_js.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/resources/themes/default/theme.inc b/ui/resources/themes/default/theme.inc index 93d423a201..6302c1c551 100644 --- a/ui/resources/themes/default/theme.inc +++ b/ui/resources/themes/default/theme.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/scripts/2.2/update22/obminclude/of/of_session.inc b/ui/scripts/2.2/update22/obminclude/of/of_session.inc index 48a3bbab69..4bbca785bc 100644 --- a/ui/scripts/2.2/update22/obminclude/of/of_session.inc +++ b/ui/scripts/2.2/update22/obminclude/of/of_session.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/scripts/2.2/update22/obminclude/phplib/obmlib.inc b/ui/scripts/2.2/update22/obminclude/phplib/obmlib.inc index aa548f035e..a3523e6bab 100644 --- a/ui/scripts/2.2/update22/obminclude/phplib/obmlib.inc +++ b/ui/scripts/2.2/update22/obminclude/phplib/obmlib.inc @@ -1,4 +1,4 @@ - +?> diff --git a/ui/scripts/2.2/update22/scripts/2.2/update-2.1-2.2.php b/ui/scripts/2.2/update22/scripts/2.2/update-2.1-2.2.php index dd633ad0ba..e29bcb11fe 100644 --- a/ui/scripts/2.2/update22/scripts/2.2/update-2.1-2.2.php +++ b/ui/scripts/2.2/update22/scripts/2.2/update-2.1-2.2.php @@ -29,7 +29,7 @@ # applicable to the OBM software. */ ?> - +?> diff --git a/ui/tests/test-list.php b/ui/tests/test-list.php index ea87c19cf7..5af7d8d1f9 100644 --- a/ui/tests/test-list.php +++ b/ui/tests/test-list.php @@ -31,7 +31,7 @@ ?> - +?> From 7caaf20d9fa10c064b3dc9ee8e14b9030ad1148c Mon Sep 17 00:00:00 2001 From: Jeremy Carnus Date: Thu, 24 Aug 2017 10:03:48 -0400 Subject: [PATCH 04/22] Fix build dependency --- java/sync/debian/control | 8 ++++---- java/tomcat/debian/control | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/java/sync/debian/control b/java/sync/debian/control index 3dd5a9e707..753e3cca49 100644 --- a/java/sync/debian/control +++ b/java/sync/debian/control @@ -2,7 +2,7 @@ Source: obm-java Section: net Priority: optional Maintainer: Thomas Sarboni -Build-Depends: cdbs, maven, debhelper (>= 5.0), openjdk-8-jdk +Build-Depends: cdbs, maven, debhelper (>= 5.0), openjdk-7-jdk Standards-Version: 3.8.3 Homepage: http://www.obm.org @@ -20,7 +20,7 @@ Description: synchronization application for Open Business Management Package: obm-locator Architecture: all -Depends: openjdk-8-jre-headless, obm-conf (= ${binary:Version}), openssl, insserv +Depends: openjdk-7-jre-headless|openjdk-8-jre-headless, obm-conf (= ${binary:Version}), openssl, insserv Description: Locator for Open Business Management This package is a J2E web service, which allows can be queried to retrieve the location of an OBM component. @@ -32,7 +32,7 @@ Description: Locator for Open Business Management Package: obm-provisioning Architecture: all -Depends: openjdk-8-jre-headless, obm-conf (= ${binary:Version}) +Depends: openjdk-7-jre-headless|openjdk-8-jre-headless, obm-conf (= ${binary:Version}) Description: Provisioning API for Open Business Management This package is an HTTP web service, which can be queried to provision an OBM server. @@ -68,7 +68,7 @@ Description: Tomcat common libs for Open Business Management Package: obm-imap-archive Architecture: all -Depends: openjdk-8-jre-headless, obm-conf (= ${binary:Version}) +Depends: openjdk-7-jre-headless|openjdk-8-jre-headless, obm-conf (= ${binary:Version}) Description: OBM component that perform email archiving obm-imap-archive is a http server exposing webservices to perform email archiving. . diff --git a/java/tomcat/debian/control b/java/tomcat/debian/control index 16ea2bb284..9d0aae92d0 100644 --- a/java/tomcat/debian/control +++ b/java/tomcat/debian/control @@ -10,7 +10,7 @@ Homepage: http://www.obm.org Package: obm-tomcat Architecture: all -Depends: openjdk-8-jre-headless, libapr1, ${misc:Depends} +Depends: openjdk-7-jre-headless|openjdk-8-jre-headless, libapr1, ${misc:Depends} Description: the Tomcat web application server for Open Business Management This package contains the 6.0.20 version of the Apache Tomcat application server for OBM. From 65eb2151b35ef1b4d92ff2b00910876d7f14f14d Mon Sep 17 00:00:00 2001 From: Jeremy Carnus Date: Thu, 24 Aug 2017 13:27:25 -0400 Subject: [PATCH 05/22] Fix PHP 7 error --- ui/conf/obm_conf.inc.sample | 2 +- ui/obminclude/phplib/db_pgsql.inc | 2 +- ui/php/obm.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/conf/obm_conf.inc.sample b/ui/conf/obm_conf.inc.sample index 434154d4e1..f80cfd9465 100644 --- a/ui/conf/obm_conf.inc.sample +++ b/ui/conf/obm_conf.inc.sample @@ -353,4 +353,4 @@ $backup_desactived_mail = false; // New Top Bar OBM 3.0 $conf_obm3_topbar = true; - +?> diff --git a/ui/obminclude/phplib/db_pgsql.inc b/ui/obminclude/phplib/db_pgsql.inc index 3a049f5c60..2d9ba19940 100644 --- a/ui/obminclude/phplib/db_pgsql.inc +++ b/ui/obminclude/phplib/db_pgsql.inc @@ -409,7 +409,7 @@ class DB_Sql { // #X(Y) => self:X(Y) if(!empty($match[1][$key])) { if(!is_null($args) && method_exists(__CLASS__, $match[2][$key])) { - $pcode = self::$match[2][$key]($args); + $pcode = self::{$match[2][$key]}($args); } elseif(property_exists(__CLASS__, $match[2][$key])) { $pcode = self::${$match[2][$key]}; } else { diff --git a/ui/php/obm.php b/ui/php/obm.php index 695b482b44..eb72292cfa 100644 --- a/ui/php/obm.php +++ b/ui/php/obm.php @@ -641,4 +641,4 @@ function dis_portlets_menu() { return $block; } - +?> From 2af2d10d9bef90e3f92881e33b5f8bc14b9d1789 Mon Sep 17 00:00:00 2001 From: Jeremy Carnus Date: Thu, 24 Aug 2017 14:17:00 -0400 Subject: [PATCH 06/22] Tomcat fix init script --- java/tomcat/debian/obm-tomcat.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/tomcat/debian/obm-tomcat.init b/java/tomcat/debian/obm-tomcat.init index 274e462405..100a60faab 100644 --- a/java/tomcat/debian/obm-tomcat.init +++ b/java/tomcat/debian/obm-tomcat.init @@ -36,7 +36,7 @@ if [ -r /etc/default/rcS ]; then fi if [ -z "$JAVA_HOME" ]; then - JAVA_HOME="/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture` + JAVA_HOME="usr" fi if [ -z "$SHUTDOWN_TIMEOUT" ]; then SHUTDOWN_TIMEOUT=10 From af09e5d7362bd1d2396f8b64e7546507dd8060e5 Mon Sep 17 00:00:00 2001 From: Jeremy Carnus Date: Thu, 24 Aug 2017 14:17:20 -0400 Subject: [PATCH 07/22] Include php-mbstring --- ui/debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/debian/control b/ui/debian/control index 5fb3ea25f5..f963adc2db 100644 --- a/ui/debian/control +++ b/ui/debian/control @@ -87,7 +87,7 @@ Description: certificate generation for OBM Package: obm-ui Architecture: all -Depends: obm-core (= ${binary:Version}), obm-certs (= ${binary:Version}), php, apache2, libapache2-mod-php, php-pgsql | php-mysql, php-gd, php-imap, php-db, php-ldap, ${misc:Depends} +Depends: obm-core (= ${binary:Version}), obm-certs (= ${binary:Version}), php, apache2, libapache2-mod-php, php-pgsql | php-mysql, php-gd, php-imap, php-db, php-ldap, php-mbstring, ${misc:Depends} Recommends: php-imagick Description: web interface configuration for OBM This package configures Apache to serve OBM components (obm-ui, obm-storage). From 527c9f11ba938c7aeb6516fbf93e892c23f9d56d Mon Sep 17 00:00:00 2001 From: Jeremy Carnus Date: Thu, 24 Aug 2017 16:43:50 -0400 Subject: [PATCH 08/22] Fix tomcat/debian/obm-tomcat.init --- java/tomcat/debian/obm-tomcat.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/tomcat/debian/obm-tomcat.init b/java/tomcat/debian/obm-tomcat.init index 100a60faab..70c7cfb8ca 100644 --- a/java/tomcat/debian/obm-tomcat.init +++ b/java/tomcat/debian/obm-tomcat.init @@ -36,7 +36,7 @@ if [ -r /etc/default/rcS ]; then fi if [ -z "$JAVA_HOME" ]; then - JAVA_HOME="usr" + JAVA_HOME="/usr" fi if [ -z "$SHUTDOWN_TIMEOUT" ]; then SHUTDOWN_TIMEOUT=10 From d819bcbe3b117bc9a146c60171380638c6d7dfa4 Mon Sep 17 00:00:00 2001 From: Jeremy Carnus Date: Fri, 25 Aug 2017 08:59:06 -0400 Subject: [PATCH 09/22] Fix preg_replace --- ui/obminclude/of/of_search.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/obminclude/of/of_search.php b/ui/obminclude/of/of_search.php index eb9ccc3222..afaa285716 100644 --- a/ui/obminclude/of/of_search.php +++ b/ui/obminclude/of/of_search.php @@ -51,7 +51,7 @@ public static function search($core, $pattern, $offset, $limit, $options) { // $pattern = strtolower($pattern); => do not work because of solr keyword "OR" and "AND" // replace compound word in pattern $pattern = preg_replace("/(?<=[a-zA-Z])-(?=[a-zA-Z])/"," + ", $pattern); - $pattern = preg_replace("/(\w*)\*/e", "strtolower('$1').'*'", $pattern); + $pattern = preg_replace_callback("/(\w*)\*/", function($m){return strtolower($m[1]).'*';}, $pattern); $response = $solr->search($pattern, $offset, $limit, $options); display_debug_solr($pattern, $cdg_solr, "OBM_Search::search($core)"); if($response->response->numFound > 0) { @@ -80,7 +80,7 @@ public static function count($core, $pattern) { $pattern = "domain:$obm[domain_id]"; } $pattern = preg_replace("/(?<=[a-zA-Z])-(?=[a-zA-Z])/"," + ", $pattern); - $pattern = preg_replace("/(\w*)\*/e", "strtolower('$1').'*'", $pattern); + $pattern = preg_replace_callback("/(\w*)\*/", function($m){return strtolower($m[1]).'*';}, $pattern); $response = $solr->search($pattern); return $response->response->numFound; } catch(Exception $e) { From 58a128065ec147a68094a85a6ca4f6fcc7c37ad4 Mon Sep 17 00:00:00 2001 From: Jeremy Carnus Date: Fri, 25 Aug 2017 16:39:03 -0400 Subject: [PATCH 10/22] Fix java home path --- java/sync/debian/obm-imap-archive.init | 2 +- java/sync/debian/obm-provisioning.init | 2 +- java/sync/obm-locator/obm-locator.debian.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java/sync/debian/obm-imap-archive.init b/java/sync/debian/obm-imap-archive.init index 40b1e99cc0..c6c94ce9e8 100755 --- a/java/sync/debian/obm-imap-archive.init +++ b/java/sync/debian/obm-imap-archive.init @@ -43,7 +43,7 @@ if [ -z "$APP_PORT" ]; then APP_PORT=8085 fi if [ -z "$JAVA_HOME" ]; then - JAVA_HOME="/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture` + JAVA_HOME="/usr" fi if [ ! -d "$TMP_DIR" ]; then diff --git a/java/sync/debian/obm-provisioning.init b/java/sync/debian/obm-provisioning.init index a10ae65e9b..9ad6cb0ab1 100755 --- a/java/sync/debian/obm-provisioning.init +++ b/java/sync/debian/obm-provisioning.init @@ -55,7 +55,7 @@ if [ -z "$JAVA_HOME" ]; then } fi if [ -z "$JAVA_HOME" ]; then - JAVA_HOME="/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture` + JAVA_HOME="/usr" fi # Timeout in seconds for the shutdown of all webapps diff --git a/java/sync/obm-locator/obm-locator.debian.sh b/java/sync/obm-locator/obm-locator.debian.sh index bd84180be1..437adf8fc3 100755 --- a/java/sync/obm-locator/obm-locator.debian.sh +++ b/java/sync/obm-locator/obm-locator.debian.sh @@ -56,7 +56,7 @@ if [ -z "$JAVA_HOME" ]; then } fi if [ -z "$JAVA_HOME" ]; then - JAVA_HOME="/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture` + JAVA_HOME="/usr" fi # Timeout in seconds for the shutdown of all webapps From bda7c08aac4614850be80a4d4d81bcac06a6d95b Mon Sep 17 00:00:00 2001 From: Jeremy Carnus Date: Mon, 28 Aug 2017 10:40:40 -0400 Subject: [PATCH 11/22] Missing old script to be removed --- ui/obminclude/lang/fr/todo.inc | 1 - ui/php/password/password_query.inc | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ui/obminclude/lang/fr/todo.inc b/ui/obminclude/lang/fr/todo.inc index ecaea6d50c..7007260555 100644 --- a/ui/obminclude/lang/fr/todo.inc +++ b/ui/obminclude/lang/fr/todo.inc @@ -35,4 +35,3 @@ $l_err_percent = "Le pourcentage doit être compris entre 0 et 100"; $l_todo_display = "Options d'affichage des listes de tâches à faire"; $l_todo_prefs = "Options d'affichage des listes de tâches urgentes"; - diff --git a/ui/php/password/password_query.inc b/ui/php/password/password_query.inc index f7d67a34e6..a095276fb2 100644 --- a/ui/php/password/password_query.inc +++ b/ui/php/password/password_query.inc @@ -217,4 +217,4 @@ function check_data_form($usr_q, $password) { } - +?> From c43c3db11f20813a95f947ea57ef737ef7ed6b23 Mon Sep 17 00:00:00 2001 From: Jeremy Carnus Date: Tue, 29 Aug 2017 16:40:56 -0400 Subject: [PATCH 12/22] Fix sieve not working --- ui/doc/conf/cyrus_cyrus.conf.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/doc/conf/cyrus_cyrus.conf.sample b/ui/doc/conf/cyrus_cyrus.conf.sample index cbb780081f..fdb61ddc3a 100644 --- a/ui/doc/conf/cyrus_cyrus.conf.sample +++ b/ui/doc/conf/cyrus_cyrus.conf.sample @@ -44,7 +44,7 @@ SERVICES { # useful if you need to give users remote access to sieve # by default, we limit this to localhost in Debian - sieve cmd="timsieved" listen=":sieve" prefork=1 maxchild=100 + sieve cmd="timsieved" listen="localhost:sieve" prefork=0 maxchild=100 # this one is needed for the notification services notify cmd="notifyd" listen="/var/run/cyrus/socket/notify" proto="udp" prefork=1 From 6fae455eaa583060c7862a05a0a823dfd3b4ef0c Mon Sep 17 00:00:00 2001 From: Jeremy Carnus Date: Wed, 30 Aug 2017 13:18:16 -0400 Subject: [PATCH 13/22] Replace split by explode --- ui/php/calendar/calendar_display.inc | 4 ++-- ui/php/campaign/campaign_query.inc | 6 +++--- ui/php/campaign/obm_test.inc | 8 ++++---- ui/php/campaign/ws/campaignws.class.php | 4 ++-- ui/php/group/group_query.inc | 2 +- ui/php/invoice/invoice_display.inc | 10 +++++----- ui/php/publication/publication_query.inc | 2 +- ui/php/user/user_query.inc | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ui/php/calendar/calendar_display.inc b/ui/php/calendar/calendar_display.inc index 473c7415c8..46b5093cdc 100644 --- a/ui/php/calendar/calendar_display.inc +++ b/ui/php/calendar/calendar_display.inc @@ -204,7 +204,7 @@ function format_field_for_solr_query($string){ $string = trim($string); $string = strtolower($string); $string = preg_replace('/([^\d\s][^\s])([0-9])/', '\1 \2', $string); - $words = split(' ', $string); + $words = explode(' ', $string); foreach ($words as $word){ $formated_word = ( substr($word, -1) == '*' ) ? $word : $word.'*'; $formated_string .= ( end($words) == $word ) ? $formated_word : $formated_word.' '; @@ -8922,7 +8922,7 @@ Class CalendarPdf{ $vowels = '/[aeiouy]/'; - $words = split(' ', $string); + $words = explode(' ', $string); foreach ($words as $k => $v) { if ($this->getStringWidth($v) > $max_width) { $letters = str_split($v, 1); diff --git a/ui/php/campaign/campaign_query.inc b/ui/php/campaign/campaign_query.inc index abb371580f..d7de2c4644 100644 --- a/ui/php/campaign/campaign_query.inc +++ b/ui/php/campaign/campaign_query.inc @@ -592,7 +592,7 @@ function check_campaign_can_delete($p_id) { function check_compare_convert_to_value ($str) { if (preg_match('/..\/..\/../', $str)) { - list($month, $day, $year) = split('/', $str); + list($month, $day, $year) = explode('/', $str); return mktime(0,0,0, $month, $day, $year); } return $str; @@ -725,8 +725,8 @@ function run_query_campaign_import_sent_emails () { $obm_q->query($query); while ($obm_q->next_record()) { - foreach (split("\n", $obm_q->f('campaignpushtarget_properties')) as $line) { - list($var, $value) = split('=', $line); + foreach (explode("\n", $obm_q->f('campaignpushtarget_properties')) as $line) { + list($var, $value) = explode('=', $line); if ($var == 'id') $entity_id = $value +0; diff --git a/ui/php/campaign/obm_test.inc b/ui/php/campaign/obm_test.inc index d1eed49dbe..894b7d270b 100644 --- a/ui/php/campaign/obm_test.inc +++ b/ui/php/campaign/obm_test.inc @@ -71,7 +71,7 @@ abstract class OBM_Test { $code = substr($code, $start, $end - $start); $res_code = array(); - foreach (split("\n", $code) as $line) { + foreach (explode("\n", $code) as $line) { if (!preg_match("/\/\/\ +OBM +TEST +delete/i", $line)) $res_code[] = $line; } @@ -82,7 +82,7 @@ abstract class OBM_Test { public static function get_body_function ($function_name) { $func = new ReflectionFunction($function_name); - $lines = split("\n", file_get_contents($func->getFileName())); + $lines = explode("\n", file_get_contents($func->getFileName())); $res = array(); for ($i = $func->getStartLine(); $i <= $func->getEndLine(); $i += 1) { $res[] = $lines[$i]; @@ -217,7 +217,7 @@ class OBM_TestContext_Action extends OBM_TestContext { class OBM_Test_DB extends DB_OBM { function query_rand ($query, $primary_key, $count) { - list($select, $from) = split(' FROM ', $query); + list($select, $from) = explode(' FROM ', $query); $keys = array(); @@ -237,7 +237,7 @@ class OBM_Test_DB extends DB_OBM { } } - list($select, $where) = split(' WHERE ', $query); + list($select, $where) = explode(' WHERE ', $query); $query = $select; diff --git a/ui/php/campaign/ws/campaignws.class.php b/ui/php/campaign/ws/campaignws.class.php index 709b2197dc..f3f82d91eb 100644 --- a/ui/php/campaign/ws/campaignws.class.php +++ b/ui/php/campaign/ws/campaignws.class.php @@ -112,7 +112,7 @@ function eachTargets($campaign_ids, $method) { $obm_q->query($query); while ($obm_q->next_record()) { - $emails = split("\n", $obm_q->f('email')); + $emails = explode("\n", $obm_q->f('email')); $newTarget = new Target(); @@ -159,7 +159,7 @@ function eachTargets($campaign_ids, $method) { $obm_q->query($query); while ($obm_q->next_record()) { - $emails = split("\n", $obm_q->f('email')); + $emails = explode("\n", $obm_q->f('email')); $newTarget = new Target(); diff --git a/ui/php/group/group_query.inc b/ui/php/group/group_query.inc index 741bff4c9b..368962df40 100644 --- a/ui/php/group/group_query.inc +++ b/ui/php/group/group_query.inc @@ -87,7 +87,7 @@ function run_query_group_search($group) { $where .= " AND group_delegation $like '".$obm_q->escape($delegation)."%'"; } if ($email != '') { - list($left,$right) = split('@',$email); + list($left,$right) = explode('@',$email); if ($right === null){ $left = $obm_q->escape($left).'%'; $right = $obm_q->escape($left); diff --git a/ui/php/invoice/invoice_display.inc b/ui/php/invoice/invoice_display.inc index d9320d707f..a8ef79488e 100644 --- a/ui/php/invoice/invoice_display.inc +++ b/ui/php/invoice/invoice_display.inc @@ -863,8 +863,8 @@ function dis_invoice_detail($inv_q) { $odf_relance = glob('relance_*.odt'); -list( $year_o, $month_o, $day_o ) = split( ',', date('Y,n,j', strtotime($inv_q->f('invoice_expiration_date')))); -list( $year_c, $month_c, $day_c ) = split( ',', date('Y,n,j')); +list( $year_o, $month_o, $day_o ) = explode( ',', date('Y,n,j', strtotime($inv_q->f('invoice_expiration_date')))); +list( $year_c, $month_c, $day_c ) = explode( ',', date('Y,n,j')); $duration = (mktime(0,0,0, $month_c, $day_c, $year_c) - mktime(0,0,0, $month_o, $day_o, $year_o)); @@ -1987,7 +1987,7 @@ function dis_invoice_all_reminder($inv_q) { $l_expiration"; while($inv_q->next_record()) { - list( $year_o, $month_o, $day_o ) = split( ',', date('Y,n,j', strtotime($inv_q->f('expiration_date')))); + list( $year_o, $month_o, $day_o ) = explode( ',', date('Y,n,j', strtotime($inv_q->f('expiration_date')))); $date_expiration=date('d/m/y',mktime(0,0,0, $month_o, $day_o, $year_o)); $block.=''.$inv_q->f('company_name').' @@ -2005,8 +2005,8 @@ function dis_invoice_reminder_company($inv_q) { while($inv_q->next_record()) { - list( $year_o, $month_o, $day_o ) = split( ',', date('Y,n,j', strtotime($inv_q->f('invoice_expiration_date')))); - list( $year_c, $month_c, $day_c ) = split( ',', date('Y,n,j')); + list( $year_o, $month_o, $day_o ) = explode( ',', date('Y,n,j', strtotime($inv_q->f('invoice_expiration_date')))); + list( $year_c, $month_c, $day_c ) = explode( ',', date('Y,n,j')); $duration = (mktime(0,0,0, $month_c, $day_c, $year_c) - mktime(0,0,0, $month_o, $day_o, $year_o)); $duration_day = (int) ( $duration / (60 * 60 * 24)); diff --git a/ui/php/publication/publication_query.inc b/ui/php/publication/publication_query.inc index f35b08549f..8b458be4b5 100644 --- a/ui/php/publication/publication_query.inc +++ b/ui/php/publication/publication_query.inc @@ -303,7 +303,7 @@ function run_query_publication_auto_subscription($publication) { $list_sub = $publication['list']; $recept = sql_parse_id($c_focsys); $lang = $publication['lang']; - $lang_array = split('-', $lang); + $lang_array = explode('-', $lang); $domain_id = sql_parse_id($obm['domain_id']); $nb = 0; $uid = sql_parse_id($obm['uid']); diff --git a/ui/php/user/user_query.inc b/ui/php/user/user_query.inc index 0bef1c6cbe..2f69465127 100644 --- a/ui/php/user/user_query.inc +++ b/ui/php/user/user_query.inc @@ -171,7 +171,7 @@ function run_query_user_search($user, $user_results_limit, $strongest_profile_le // If an email indication has been specified, get it if (trim($email) != '') { if (trim($where) != '') $where .= ' AND'; - list($left,$right) = split('@',$email); + list($left,$right) = explode('@',$email); if ($right === null){ $left = $left.'%'; $right = $left; From e23db91e3952e3351e4e3783429fa5d9a334ac4f Mon Sep 17 00:00:00 2001 From: Jeremy Carnus Date: Wed, 30 Aug 2017 13:23:55 -0400 Subject: [PATCH 14/22] Fix deprecated cyrus option --- ui/doc/conf/cyrus_imapd.conf.sample | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ui/doc/conf/cyrus_imapd.conf.sample b/ui/doc/conf/cyrus_imapd.conf.sample index 1474352dbe..89dc0cceb4 100644 --- a/ui/doc/conf/cyrus_imapd.conf.sample +++ b/ui/doc/conf/cyrus_imapd.conf.sample @@ -99,7 +99,7 @@ popminpoll: 0 # If nonzero, normal users may create their own IMAP accounts by creating # the mailbox INBOX. The user's quota is set to the value if it is positive, # otherwise the user has unlimited quota. -autocreatequota: 0 +autocreate_quota: 0 # umask used by Cyrus programs umask: 077 @@ -228,16 +228,16 @@ sasl_auto_transition: no # # Use OBM generated certs for TLS -tls_cert_file: /etc/obm/certs/obm_cert.pem -tls_key_file: /etc/obm/certs/obm_cert.pem -tls_ca_file: /var/lib/obm-ca/cacert.pem +tls_server_cert: /etc/obm/certs/obm_cert.pem +tls_server_key: /etc/obm/certs/obm_cert.pem +tls_client_ca_file: /var/lib/obm-ca/cacert.pem # File containing the global certificate used for ALL services (imap, pop3, # lmtp, sieve) -#tls_cert_file: /etc/ssl/certs/ssl-cert-snakeoil.pem +#tls_server_cert: /etc/ssl/certs/ssl-cert-snakeoil.pem # File containing the private key belonging to the global server certificate. -#tls_key_file: /etc/ssl/private/ssl-cert-snakeoil.key +#tls_server_key: /etc/ssl/private/ssl-cert-snakeoil.key # File containing the certificate used for imap. If not specified, the global # certificate is used. A value of "disabled" will disable SSL/TLS for imap. @@ -276,10 +276,10 @@ tls_ca_file: /var/lib/obm-ca/cacert.pem #sieve_tls_key_file: /etc/ssl/private/cyrus-sieve.key # File containing one or more Certificate Authority (CA) certificates. -#tls_ca_file: /etc/ssl/certs/cyrus-imapd-ca.pem +#tls_client_ca_file: /etc/ssl/certs/cyrus-imapd-ca.pem # Path to directory with certificates of CAs. -tls_ca_path: /etc/ssl/certs +tls_client_ca_dir: /etc/ssl/certs # The length of time (in minutes) that a TLS session will be cached for later # reuse. The maximum value is 1440 (24 hours), the default. A value of 0 will @@ -291,7 +291,7 @@ tls_session_timeout: 1440 # selects TLSv1 high-security ciphers only, and removes all anonymous ciphers # from the list (because they provide no defense against man-in-the-middle # attacks). It also orders the list so that stronger ciphers come first. -tls_cipher_list: TLSv1+HIGH:!aNULL:@STRENGTH +tls_ciphers: TLSv1+HIGH:!aNULL:@STRENGTH # Require a client certificate for ALL services (imap, pop3, lmtp, sieve). #tls_require_cert: false From c676f29d0dba8f629daa7e2b3d3c201296e696b7 Mon Sep 17 00:00:00 2001 From: Jeremy Carnus Date: Wed, 30 Aug 2017 14:22:24 -0400 Subject: [PATCH 15/22] Fix SSL warning --- ui/auto/libperl-OBM/OBM/ObmSatellite/client.pm | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/ui/auto/libperl-OBM/OBM/ObmSatellite/client.pm b/ui/auto/libperl-OBM/OBM/ObmSatellite/client.pm index fdce3bbdb5..797fa3e794 100644 --- a/ui/auto/libperl-OBM/OBM/ObmSatellite/client.pm +++ b/ui/auto/libperl-OBM/OBM/ObmSatellite/client.pm @@ -132,7 +132,13 @@ sub get { # Add authentication headers $request->authorization_basic( $self->{'obmSatelliteLogin'}, $self->{'obmSatellitePassword'} ); - my $ua = LWP::UserAgent->new(); + my $ua = LWP::UserAgent->new( + ssl_opts => { + verify_hostname => 0, + SSL_verify_mode => 0 + } + ); + if( !$ua ) { $self->_log( 'erreur à l\'initialisation du navigateur LWP::UserAgent', 0 ); return 1; @@ -177,7 +183,12 @@ sub post { # Add authentication headers $request->authorization_basic( $self->{'obmSatelliteLogin'}, $self->{'obmSatellitePassword'} ); - my $ua = LWP::UserAgent->new(); + my $ua = LWP::UserAgent->new( + ssl_opts => { + verify_hostname => 0, + SSL_verify_mode => 0 + } + ); if( !$ua ) { $self->_log( 'erreur à l\'initialisation du navigateur LWP::UserAgent', 0 ); return 1; From 65c140ed80e280a3518b24618e3daa22019b4ffe Mon Sep 17 00:00:00 2001 From: Jeremy Carnus Date: Thu, 31 Aug 2017 10:42:19 -0400 Subject: [PATCH 16/22] Fix bad cyrus lib directory --- ui/doc/conf/cyrus_cyrus.conf.sample | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ui/doc/conf/cyrus_cyrus.conf.sample b/ui/doc/conf/cyrus_cyrus.conf.sample index fdb61ddc3a..dc40397551 100644 --- a/ui/doc/conf/cyrus_cyrus.conf.sample +++ b/ui/doc/conf/cyrus_cyrus.conf.sample @@ -6,7 +6,7 @@ START { # do not delete this entry! - recover cmd="/usr/sbin/ctl_cyrusdb -r" + recover cmd="/usr/lib/cyrus/bin/ -r" # this is only necessary if idlemethod is set to "idled" in imapd.conf idled cmd="idled" @@ -14,12 +14,12 @@ START { # this is useful on backend nodes of a Murder cluster # it causes the backend to syncronize its mailbox list with # the mupdate master upon startup - #mupdatepush cmd="/usr/sbin/ctl_mboxlist -m" + #mupdatepush cmd="/usr/lib/cyrus/bin/ctl_mboxlist -m" # this is recommended if using duplicate delivery suppression - delprune cmd="/usr/sbin/cyr_expire -E 3" + delprune cmd="/usr/lib/cyrus/bin/cyr_expire -E 3" # this is recommended if caching TLS sessions - tlsprune cmd="/usr/sbin/tls_prune" + tlsprune cmd="/usr/lib/cyrus/bin/tls_prune" } # UNIX sockets start with a slash and are absolute paths @@ -30,9 +30,9 @@ SERVICES { # --- Normal cyrus spool, or Murder backends --- # add or remove based on preferences imap cmd="imapd -U 30" listen="imap" prefork=10 maxchild=200 proto=tcp4 maxforkrate=4 - #imaps cmd="imapd -s -U 30" listen="imaps" prefork=0 maxchild=100 proto=tcp4 maxforkrate=4 + imaps cmd="imapd -s -U 30" listen="imaps" prefork=0 maxchild=100 proto=tcp4 maxforkrate=4 pop3 cmd="pop3d -U 30" listen="pop3" prefork=10 maxchild=50 proto=tcp4 maxforkrate=4 - #pop3s cmd="pop3d -s -U 30" listen="pop3s" prefork=0 maxchild=50 proto=tcp4 maxforkrate + pop3s cmd="pop3d -s -U 30" listen="pop3s" prefork=0 maxchild=50 proto=tcp4 maxforkrate #nntp cmd="nntpd -U 30" listen="nntp" prefork=0 maxchild=100 proto=tcp4 #nntps cmd="nntpd -s -U 30" listen="nntps" prefork=0 maxchild=100 proto=tcp4 From 382a94923942eab8ec5a3243e9675e5bbc0e38d2 Mon Sep 17 00:00:00 2001 From: Jeremy Carnus Date: Thu, 31 Aug 2017 10:53:00 -0400 Subject: [PATCH 17/22] Fix bin directory --- ui/doc/conf/cyrus_cyrus.conf.sample | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/ui/doc/conf/cyrus_cyrus.conf.sample b/ui/doc/conf/cyrus_cyrus.conf.sample index dc40397551..3fe760e4b9 100644 --- a/ui/doc/conf/cyrus_cyrus.conf.sample +++ b/ui/doc/conf/cyrus_cyrus.conf.sample @@ -6,7 +6,7 @@ START { # do not delete this entry! - recover cmd="/usr/lib/cyrus/bin/ -r" + recover cmd="/usr/lib/cyrus/bin/ctl_cyrusdb -r" # this is only necessary if idlemethod is set to "idled" in imapd.conf idled cmd="idled" @@ -18,8 +18,6 @@ START { # this is recommended if using duplicate delivery suppression delprune cmd="/usr/lib/cyrus/bin/cyr_expire -E 3" - # this is recommended if caching TLS sessions - tlsprune cmd="/usr/lib/cyrus/bin/tls_prune" } # UNIX sockets start with a slash and are absolute paths @@ -70,13 +68,13 @@ SERVICES { EVENTS { # this is required - checkpoint cmd="/usr/sbin/ctl_cyrusdb -c" period=30 + checkpoint cmd="/usr/lib/cyrus/bin/ctl_cyrusdb -c" period=30 # this is only necessary if using duplicate delivery suppression - delprune cmd="/usr/sbin/cyr_expire -E 3" at=0401 + delprune cmd="/usr/lib/cyrus/bin/cyr_expire -E 3" at=0401 # this is only necessary if caching TLS sessions - tlsprune cmd="/usr/sbin/tls_prune" at=0401 + tlsprune cmd="/usr/lib/cyrus/bin/tls_prune" at=0401 # indexing of mailboxs for server side fulltext searches From 8f7a9bb5cfe9d98d39c824f9d930de91696b76d8 Mon Sep 17 00:00:00 2001 From: Jeremy Carnus Date: Thu, 31 Aug 2017 13:30:29 -0400 Subject: [PATCH 18/22] Fix obm-satellite dependency --- satellite/debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/satellite/debian/control b/satellite/debian/control index fdc4beed4e..01aaa3ee95 100644 --- a/satellite/debian/control +++ b/satellite/debian/control @@ -22,7 +22,7 @@ Description: integration of OBM with Cyrus and Postfix Package: libobmsatellite-perl Section: perl Architecture: all -Depends: libnet-server-perl, libnet-ldap-perl, libunicode-maputf8-perl, libio-socket-ssl-perl, libclass-singleton-perl, libxml-simple-perl, liblog-log4perl-perl, libmime-lite-perl, libmailtools-perl, libmime-types-perl, ${perl:Depends}, ${misc:Depends} +Depends: libnet-server-perl, libnet-ldap-perl, libunicode-maputf8-perl, libio-socket-ssl-perl, libclass-singleton-perl, libxml-simple-perl, liblog-log4perl-perl, libmime-lite-perl, libmailtools-perl, libmime-types-perl, libhttp-daemon-perl, ${perl:Depends}, ${misc:Depends} Description: library for the integration of OBM with Cyrus and Postfix This package contains the library used by obm-satellite to interact with Cyrus and Postfix. From 63dbac71cfa1998d35001e9c3938fe784642401d Mon Sep 17 00:00:00 2001 From: Jeremy Carnus Date: Thu, 31 Aug 2017 13:30:46 -0400 Subject: [PATCH 19/22] Cyrus conf --- ui/doc/conf/cyrus_cyrus.conf.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/doc/conf/cyrus_cyrus.conf.sample b/ui/doc/conf/cyrus_cyrus.conf.sample index 3fe760e4b9..c103b6b1e4 100644 --- a/ui/doc/conf/cyrus_cyrus.conf.sample +++ b/ui/doc/conf/cyrus_cyrus.conf.sample @@ -30,7 +30,7 @@ SERVICES { imap cmd="imapd -U 30" listen="imap" prefork=10 maxchild=200 proto=tcp4 maxforkrate=4 imaps cmd="imapd -s -U 30" listen="imaps" prefork=0 maxchild=100 proto=tcp4 maxforkrate=4 pop3 cmd="pop3d -U 30" listen="pop3" prefork=10 maxchild=50 proto=tcp4 maxforkrate=4 - pop3s cmd="pop3d -s -U 30" listen="pop3s" prefork=0 maxchild=50 proto=tcp4 maxforkrate + #pop3s cmd="pop3d -s -U 30" listen="pop3s" prefork=0 maxchild=50 proto=tcp4 maxforkrate #nntp cmd="nntpd -U 30" listen="nntp" prefork=0 maxchild=100 proto=tcp4 #nntps cmd="nntpd -s -U 30" listen="nntps" prefork=0 maxchild=100 proto=tcp4 From 9c2f349149a706c17bd55f007d7fa42cd5a0d56f Mon Sep 17 00:00:00 2001 From: Jeremy Carnus Date: Thu, 31 Aug 2017 14:32:02 -0400 Subject: [PATCH 20/22] Fix cyrus LMTP conf --- ui/doc/conf/cyrus_cyrus.conf.sample | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ui/doc/conf/cyrus_cyrus.conf.sample b/ui/doc/conf/cyrus_cyrus.conf.sample index c103b6b1e4..9d924e712b 100644 --- a/ui/doc/conf/cyrus_cyrus.conf.sample +++ b/ui/doc/conf/cyrus_cyrus.conf.sample @@ -36,8 +36,9 @@ SERVICES { # At least one form of LMTP is required for delivery # (you must keep the Unix socket name in sync with imap.conf) - lmtp cmd="lmtpd -a" listen=":24" prefork=0 maxchild=20 - lmtpunix cmd="lmtpd" listen="/var/run/cyrus/socket/lmtp" prefork=0 maxchild=20 + lmtp cmd="lmtpd -a" listen="localhost:24" prefork=0 maxchild=20 + lmtpunix cmd="lmtpd" listen="/var/run/cyrus/socket/lmtp" prefork=0 maxchild=20 + # ---------------------------------------------- # useful if you need to give users remote access to sieve From e032b54cd8d48a69da8b2203e5d3ddb3d945af0d Mon Sep 17 00:00:00 2001 From: Jeremy Carnus Date: Wed, 6 Sep 2017 10:03:31 -0400 Subject: [PATCH 21/22] Enable unit test. Need to have a working LDAp to have them OK --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 312b55abfd..497df4ac72 100644 --- a/Dockerfile +++ b/Dockerfile @@ -35,7 +35,7 @@ ADD . obm ## BUILD OBM PACKAGES RUN cd obm/java/sync && \ mvn dependency:go-offline || true && \ - mvn package -DskipTests -T1C + mvn package -T1C RUN cd obm/build-system && \ ./build.py /root/build-deb --nocompile --osversion wheezy all && \ From b7ee9356fcbb2c27ceaa83d11c52ef96243e1905 Mon Sep 17 00:00:00 2001 From: Jeremy Carnus Date: Wed, 6 Sep 2017 10:03:56 -0400 Subject: [PATCH 22/22] Auto detect java 8 or java 7 --- java/sync/debian/obm-imap-archive.init | 9 ++++++++- java/sync/debian/obm-provisioning.init | 9 ++++++++- java/sync/obm-locator/obm-locator.debian.sh | 9 ++++++++- java/tomcat/debian/obm-tomcat.init | 10 ++++++++-- 4 files changed, 32 insertions(+), 5 deletions(-) diff --git a/java/sync/debian/obm-imap-archive.init b/java/sync/debian/obm-imap-archive.init index c6c94ce9e8..1ec33c85bf 100755 --- a/java/sync/debian/obm-imap-archive.init +++ b/java/sync/debian/obm-imap-archive.init @@ -43,7 +43,14 @@ if [ -z "$APP_PORT" ]; then APP_PORT=8085 fi if [ -z "$JAVA_HOME" ]; then - JAVA_HOME="/usr" + test -d "/usr/lib/jvm/java-8-openjdk-"`dpkg --print-architecture` && { + JAVA_HOME="/usr/lib/jvm/java-8-openjdk-"`dpkg --print-architecture` + } +fi +if [ -z "$JAVA_HOME" ]; then + test -d "/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture` && { + JAVA_HOME="/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture` + } fi if [ ! -d "$TMP_DIR" ]; then diff --git a/java/sync/debian/obm-provisioning.init b/java/sync/debian/obm-provisioning.init index 9ad6cb0ab1..72fd5699bc 100755 --- a/java/sync/debian/obm-provisioning.init +++ b/java/sync/debian/obm-provisioning.init @@ -55,7 +55,14 @@ if [ -z "$JAVA_HOME" ]; then } fi if [ -z "$JAVA_HOME" ]; then - JAVA_HOME="/usr" + test -d "/usr/lib/jvm/java-8-openjdk-"`dpkg --print-architecture` && { + JAVA_HOME="/usr/lib/jvm/java-8-openjdk-"`dpkg --print-architecture` + } +fi +if [ -z "$JAVA_HOME" ]; then + test -d "/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture` && { + JAVA_HOME="/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture` + } fi # Timeout in seconds for the shutdown of all webapps diff --git a/java/sync/obm-locator/obm-locator.debian.sh b/java/sync/obm-locator/obm-locator.debian.sh index 437adf8fc3..54d89c0fc5 100755 --- a/java/sync/obm-locator/obm-locator.debian.sh +++ b/java/sync/obm-locator/obm-locator.debian.sh @@ -56,7 +56,14 @@ if [ -z "$JAVA_HOME" ]; then } fi if [ -z "$JAVA_HOME" ]; then - JAVA_HOME="/usr" + test -d "/usr/lib/jvm/java-8-openjdk-"`dpkg --print-architecture` && { + JAVA_HOME="/usr/lib/jvm/java-8-openjdk-"`dpkg --print-architecture` + } +fi +if [ -z "$JAVA_HOME" ]; then + test -d "/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture` && { + JAVA_HOME="/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture` + } fi # Timeout in seconds for the shutdown of all webapps diff --git a/java/tomcat/debian/obm-tomcat.init b/java/tomcat/debian/obm-tomcat.init index 70c7cfb8ca..29c980cc83 100644 --- a/java/tomcat/debian/obm-tomcat.init +++ b/java/tomcat/debian/obm-tomcat.init @@ -34,9 +34,15 @@ fi if [ -r /etc/default/rcS ]; then . /etc/default/rcS fi - if [ -z "$JAVA_HOME" ]; then - JAVA_HOME="/usr" + test -d "/usr/lib/jvm/java-8-openjdk-"`dpkg --print-architecture` && { + JAVA_HOME="/usr/lib/jvm/java-8-openjdk-"`dpkg --print-architecture` + } +fi +if [ -z "$JAVA_HOME" ]; then + test -d "/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture` && { + JAVA_HOME="/usr/lib/jvm/java-7-openjdk-"`dpkg --print-architecture` + } fi if [ -z "$SHUTDOWN_TIMEOUT" ]; then SHUTDOWN_TIMEOUT=10