From 253ddb0c181e9588c3af51f6584f09744583fdcb Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa <sunil@medhas.org>
Date: Tue, 12 Jul 2022 17:28:19 -0700
Subject: [PATCH] roundcube: Configure to log to journald

Tests:

- On a fresh container, install roundcube. log_driver is set to syslog in
freedombox-config.conf.

- Install roundcube without the changes. Enable local only. Apply the changes
and restart service. roundcube setup is run. log_driver is set to syslog in
freedombox-config.conf. Setting is still local-only.

- Install roundcube without the changes. Disable local only. Apply the changes
and restart service. roundcube setup is run. log_driver is set to syslog in
freedombox-config.conf. Setting is still not local-only.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
---
 actions/roundcube                    | 7 +++++--
 plinth/modules/roundcube/__init__.py | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/actions/roundcube b/actions/roundcube
index b0d7206fc..8b22bffcb 100755
--- a/actions/roundcube
+++ b/actions/roundcube
@@ -70,9 +70,12 @@ def subcommand_get_config(_):
 
 def subcommand_set_config(arguments):
     """Set the configuration."""
-    config = '<?php\n'
+    config = '''<?php
+$config['log_driver'] = 'syslog';
+'''
+
     if arguments.local_only == 'True':
-        config = '''<?php
+        config += '''
 $config['default_host'] = 'localhost';
 $config['mail_domain'] = '%n';
 
diff --git a/plinth/modules/roundcube/__init__.py b/plinth/modules/roundcube/__init__.py
index 90d2e6704..57ac2d038 100644
--- a/plinth/modules/roundcube/__init__.py
+++ b/plinth/modules/roundcube/__init__.py
@@ -44,7 +44,7 @@ class RoundcubeApp(app_module.App):
 
     app_id = 'roundcube'
 
-    _version = 2
+    _version = 3
 
     def __init__(self):
         """Create components for the app."""
@@ -100,6 +100,8 @@ def setup(helper, old_version=None):
     if old_version == 0:
         set_config(local_only=True)
         helper.call('post', app.enable)
+    elif old_version <= 2:
+        set_config(get_config()['local_only'])
 
 
 def force_upgrade(helper, packages):