Page MenuHomePhorge
Files F117424212

D5283.1774831340.diff
No OneTemporary
Actions

Authored By
Unknown
Size
4 KB
Referenced Files
None
Subscribers
None

D5283.1774831340.diff
View Options

diff --git a/bin/podman_shared b/bin/podman_shared
--- a/bin/podman_shared
+++ b/bin/podman_shared
@@ -200,6 +200,7 @@
-e KOLAB_FILES_SERVER_URL=http://localhost:8080/chwala \
-e FILEAPI_WOPI_OFFICE=http://localhost:9980 \
-e FILEAPI_KOLABFILES_BASEURI=http://localhost:8000/api \
+ -e KOLAB_API_URL=http://localhost:8000 \
-e FILE_API_SERVER_URL=http://localhost:8080/chwala/api/ \
-e KOLAB_ADDRESSBOOK_CARDDAV_SERVER=http://localhost:11080/dav \
-e KOLAB_FREEBUSY_SERVER=http://localhost:11080/freebusy/user/%u \
diff --git a/docker/roundcube/Dockerfile b/docker/roundcube/Dockerfile
--- a/docker/roundcube/Dockerfile
+++ b/docker/roundcube/Dockerfile
@@ -97,6 +97,7 @@
# ENV KOLAB_ADDRESSBOOK_CARDDAV_SERVER=
# ENV KOLAB_FILES_URL=
# ENV KOLAB_FILES_SERVER_URL=
+# ENV KOLAB_API_URL =
# ENV IMAP_HOST=
# ENV IMAP_PORT=
# ENV IMAP_TLS=
@@ -121,6 +122,7 @@
# ENV SMTP_DEBUG=
# ENV DAV_DEBUG=
# ENV ACTIVESYNC_DEBUG=
+# ENV KOLAB_API_DEBUG=
# ENV REDIS_HOST=
# ENV REDIS_PASSWORD=
# ENV PASSPORT_WEBMAIL_SSO_CLIENT_ID=
diff --git a/docker/roundcube/rootfs/opt/app-root/src/composer.json b/docker/roundcube/rootfs/opt/app-root/src/composer.json
--- a/docker/roundcube/rootfs/opt/app-root/src/composer.json
+++ b/docker/roundcube/rootfs/opt/app-root/src/composer.json
@@ -12,6 +12,13 @@
}
},
"repositories": [
+ {
+ "type": "path",
+ "url": "/opt/app-root/src/roundcubemail-plugins-kolab/plugins/kolab",
+ "options": {
+ "symlink": false
+ }
+ },
{
"type": "path",
"url": "/opt/app-root/src/roundcubemail-plugins-kolab/plugins/kolab_activesync",
@@ -145,6 +152,7 @@
"endroid/qr-code": "~1.6.5",
"guzzlehttp/guzzle": "^7.4.1",
"kolab/calendar": "~3.6.0",
+ "kolab/kolab": "~3.6.0",
"kolab/kolab_activesync": "~3.6.0",
"kolab/kolab_addressbook": "~3.6.0",
"kolab/kolab_auth": "~3.6.0",
diff --git a/docker/roundcube/rootfs/opt/app-root/src/roundcubemail-config-templates/chwala.inc.php b/docker/roundcube/rootfs/opt/app-root/src/roundcubemail-config-templates/chwala.inc.php
--- a/docker/roundcube/rootfs/opt/app-root/src/roundcubemail-config-templates/chwala.inc.php
+++ b/docker/roundcube/rootfs/opt/app-root/src/roundcubemail-config-templates/chwala.inc.php
@@ -25,9 +25,8 @@
// $config['fileapi_drivers'] = array('seafile', 'webdav');
// $config['fileapi_drivers'] = array('webdav');
-
-// Disable the kolab-auth plugin
-$config['fileapi_plugins'] = ['kolab_folders'];
+// Roundcube plugins that have to be enabled for Chwala
+$config['fileapi_plugins'] = [];
// Pre-defined list of external storage sources.
// Here admins can define sources which will be "mounted" into users folder tree
diff --git a/docker/roundcube/rootfs/opt/app-root/src/roundcubemail-config-templates/config.inc.php b/docker/roundcube/rootfs/opt/app-root/src/roundcubemail-config-templates/config.inc.php
--- a/docker/roundcube/rootfs/opt/app-root/src/roundcubemail-config-templates/config.inc.php
+++ b/docker/roundcube/rootfs/opt/app-root/src/roundcubemail-config-templates/config.inc.php
@@ -84,6 +84,7 @@
'archive',
'calendar',
'jqueryui',
+ 'kolab',
'kolab_activesync',
'kolab_addressbook',
'kolab_files',
@@ -92,7 +93,6 @@
'newmail_notifier',
'odfviewer',
'redundant_attachments',
- 'contextmenu',
'tasklist',
'enigma',
];
diff --git a/docker/roundcube/rootfs/opt/app-root/src/roundcubemail-config-templates/kolab.inc.php b/docker/roundcube/rootfs/opt/app-root/src/roundcubemail-config-templates/kolab.inc.php
new file mode 100644
--- /dev/null
+++ b/docker/roundcube/rootfs/opt/app-root/src/roundcubemail-config-templates/kolab.inc.php
@@ -0,0 +1,17 @@
+<?php
+
+// Kolab Cockpit API location. Defaults to hostname from the HTTP request
+$config['kolab_api_url'] = getenv('KOLAB_API_URL');
+
+// Enable logging of Cockpit API requests/responses (to logs/kolab.log)
+$config['kolab_api_debug'] = getenv('KOLAB_API_DEBUG');
+
+// List of allowed tasks in helpdesk mode. If empty there's no limits.
+// For example, to limit user to the Settings section only: ['settings'].
+$config['kolab_helpdesk_allowed_tasks'] = [];
+
+// Type of cache for API requests. Supported values: 'db', 'redis' and 'memcache' or 'memcached'.
+$config['kolab_client_cache'] = 'redis';
+
+// Lifetime of cache entries. Possible units: s, m, h, d, w
+$config['kolab_client_cache_ttl'] = '10m';

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 30, 12:42 AM (4 d, 16 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
18783801
Default Alt Text
D5283.1774831340.diff (4 KB)

Event Timeline