Request 2428 (accepted)

Overview

Request 2428 (accepted)

Additional Plesk packaging

Created by vanmeeuwen over 5 years ago
In state accepted

Submit roundcubemail

Submit package Kolab:Winterfell / roundcubemail to package Kolab:16 / roundcubemail

roundcubemail.spec Changed

@@ -76,6 +76,8 @@
 
 Source200:      2017111400.sql
 
+Source300:      plesk.premium.inc.php
+
 Patch201:       default-configuration.patch
 Patch202:       roundcubemail-1.4-beta86-plugin-enigma-homedir.patch
 
@@ -2369,6 +2371,10 @@
     -e '/^(%dir )*\/var\//d' \
     *.files
 
+%if 0%{?plesk}
+%{__install} %{SOURCE300} %{buildroot}%{confdir}/premium.inc.php
+%endif
+
 %pre
 if [ -L %{plugindir}/enigma/home -a ! -d %{plugindir}/enigma/home ]; then
     %{__rm} -rf %{plugindir}/enigma/home >/dev/null 2>&1 || :
@@ -2574,6 +2580,10 @@
 %{__sed} -i -r -e "s/.*(\s*define$\s*'RCMAIL_VERSION'\s*,\s*').*('$;)/\1%{version}-%{release}\2/g" \
     %{datadir}/program/include/iniset.php || :
 
+%if 0%{?plesk}
+/usr/local/psa/admin/bin/php %{_datadir}/roundcubemail/bin/fix-plesk-domains-config.php >/dev/null 2&1 || :
+%endif
+
 if [ ! -f %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted ]; then
     if [ -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ]; then
         if [ ! -z "$(grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null)" ]; then
@@ -3110,6 +3120,9 @@
 %endif
 %attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/config.inc.php
 %attr(0640,root,%{httpd_group}) %config(noreplace) %{confdir}/defaults.inc.php
+%if 0%{?plesk}
+%attr(0640,root,%{httpd_group}) %{confdir}/premium.inc.php
+%endif
 %attr(0640,root,%{httpd_group}) %{confdir}/mimetypes.php
 %attr(0770,root,%{httpd_group}) %dir %{logdir}
 %attr(0770,root,%{httpd_group}) %dir %{tmpdir}

debian.rules Changed

debian.tar.gz/roundcubemail-core.postinst Changed

fix-premium-domains-config.php Added

@@ -0,0 +1,36 @@
+<?php
+    require_once('sdk.php');
+
+    pm_Context::init('kolab');
+
+    $fm = new \pm_ServerFileManager();
+
+    $str = "";
+
+    // Get the contents of premium.inc.php from the extension.
+    if ($fm->fileExists(rtrim(pm_Context::getVarDir(), '/') . '/webmail/premium.inc.php')) {
+        $str = $fm->getFileContents(
+            rtrim(pm_Context::getVarDir(), '/') . '/webmail/premium.inc.php'
+        );
+
+    // Get the contents of premium.inc.php from the software package.
+    } elseif ('/etc/roundcubemail/premium.inc.php') {
+        $str = $fm->getFileContents('/etc/roundcubemail/premium.inc.php');
+    } else {
+        return FALSE;
+    }
+
+    foreach (pm_Domain::getAllDomains() as $domain) {
+        if ($domain->hasPermission("manage_kolab") && $domain->hasHosting()) {
+            $w_domain    = 'webmail.' . $domain_name;
+
+            if ($domain->hasPermission('manage_kolab')) {
+                if (!$fm->fileExists("/etc/roundcubemail/{$w_domain}/")) {
+                    $fm->mkdir("/etc/roundcubemail/{$w_domain}/", '0755');
+                }
+
+                $fm->filePutContents("/etc/roundcubemail/{$w_domain}/premium.inc.php", $str);
+            }
+        }
+    }
+}

plesk.config.inc.php Changed

@@ -1,8 +1,6 @@
 <?php
     include_once("/usr/share/psa-roundcube/config/config.inc.php");
 
-/*  Incompatible with the stock installation
-
     $components = explode('.', $_SERVER["HTTP_HOST"]);
 
     if (count($components) > 2) {
@@ -10,8 +8,10 @@
     }
 
     $domain = implode('.', $components);
-    $config['session_domain'] = $domain;
-*/
+
+    $config['session_domain'] = $_SERVER["HTTP_HOST"];
+    $config['username_domain'] = $domain;
+
     $config['support_url'] = "https://www.plesk.com/support/";
 
     $config['product_name'] = "Plesk Premium Mail, powered by Kolab";
@@ -45,28 +45,13 @@
     $config['enable_installer'] = false;
 
     $config['plugins'] = Array(
-            'acl',
-            'archive',
-            'calendar',
             'jqueryui',
-            'kolab_activesync',
-            'kolab_addressbook',
             'kolab_config',
-            //'kolab_delegation',
-            'kolab_files',
             'kolab_folders',
-            'kolab_notes',
-            'kolab_tags',
             'libkolab',
             'libcalendaring',
-            'managesieve',
-            'markasjunk',
-            'newmail_notifier',
-            'odfviewer',
             'password',
-            'pdfviewer',
-            'tasklist',
-            'contextmenu',
+            'contextmenu'
         );
 
     $config['activesync_plugins'] = Array(
@@ -203,6 +188,11 @@
         @include_once(RCUBE_CONFIG_DIR .'/'. $_SERVER['HTTP_HOST'] .'/'. basename(__FILE__));
     }
 
+    // Additional options for Plesk Premium Email "Gold"
+    if (file_exists(RCUBE_CONFIG_DIR .'/'. $_SERVER['HTTP_HOST'] .'/premium.inc.php')) {
+        @include_once(RCUBE_CONFIG_DIR .'/'. $_SERVER['HTTP_HOST'] .'/premium.inc.php');
+    }
+
     // Integration between Plesk Premium Email and Collabora Online extensions
     if (file_exists(RCUBE_CONFIG_DIR .'/'. $_SERVER['HTTP_HOST'] .'/collabora.inc.php')) {
         @include_once(RCUBE_CONFIG_DIR .'/'. $_SERVER['HTTP_HOST'] .'/collabora.inc.php');

plesk.premium.inc.php Added

Build Results
RPM Lint

Refresh

Comments for request 2428 0

Request History

vanmeeuwen created request over 5 years ago

Additional Plesk packaging

vanmeeuwen accepted review over 5 years ago

vanmeeuwen approved review over 5 years ago

vanmeeuwen accepted request over 5 years ago