saving uncommitted changes in /etc prior to apt run

diff --git a/.etckeeper b/.etckeeper
index b2a629c3fd1b1e991ecdfa23f47f0571dc7c9f2f..f8a871bb1c8d3709e425b7bc134624824ae35b3c 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -1169,7 +1169,10 @@ maybe chmod 0755 'roundcube'
 maybe chmod 0644 'roundcube/apache.conf'
 maybe chgrp 'www-data' 'roundcube/config.inc.php'
 maybe chmod 0640 'roundcube/config.inc.php'
+maybe chgrp 'www-data' 'roundcube/config.inc.php.orig'
+maybe chmod 0640 'roundcube/config.inc.php.orig'
 maybe chmod 0644 'roundcube/debian-db-roundcube.php'
+maybe chmod 0644 'roundcube/debian-db.php'
 maybe chmod 0644 'roundcube/defaults.inc.php'
 maybe chmod 0644 'roundcube/htaccess'
 maybe chmod 0644 'roundcube/lighttpd.conf'

diff --git a/roundcube/config.inc.php.orig b/roundcube/config.inc.php.orig
new file mode 100644 (file)
index 0000000..39dc95e
--- /dev/null
+++ b/roundcube/config.inc.php.orig
@@ -0,0 +1,67 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | Local configuration for the Roundcube Webmail installation.           |
+ |                                                                       |
+ | This is a sample configuration file only containing the minimum       |
+ | setup required for a functional installation. Copy more options       |
+ | from defaults.inc.php to this file to override the defaults.          |
+ |                                                                       |
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) The Roundcube Dev Team                                  |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ +-----------------------------------------------------------------------+
+*/
+
+$config = [];
+
+// Do not set db_dsnw here, use dpkg-reconfigure roundcube-core to configure database!
+include("/etc/roundcube/debian-db-roundcube.php");
+
+// IMAP host chosen to perform the log-in.
+// See defaults.inc.php for the option description.
+$config['imap_host'] = ["localhost:143"];
+
+// SMTP server host (for sending mails).
+// See defaults.inc.php for the option description.
+$config['smtp_host'] = 'localhost:587';
+
+// SMTP username (if required) if you use %u as the username Roundcube
+// will use the current username for login
+$config['smtp_user'] = '%u';
+
+// SMTP password (if required) if you use %p as the password Roundcube
+// will use the current user's password for login
+$config['smtp_pass'] = '%p';
+
+// provide an URL where a user can get support for this Roundcube installation
+// PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE!
+$config['support_url'] = '';
+
+// Name your service. This is displayed on the login screen and in the window title
+$config['product_name'] = 'Roundcube Webmail';
+
+// This key is used to encrypt the users imap password which is stored
+// in the session record. For the default cipher method it must be
+// exactly 24 characters long.
+// YOUR KEY MUST BE DIFFERENT THAN THE SAMPLE VALUE FOR SECURITY REASONS
+$config['des_key'] = 'DklwX5GsnolWEAv5fH70+6uZ';
+
+// List of active plugins (in plugins/ directory)
+// Debian: install roundcube-plugins first to have any
+$config['plugins'] = [
+    // 'archive',
+    // 'zipdownload',
+];
+
+// skin name: folder from skins/
+$config['skin'] = 'elastic';
+
+// Disable spellchecking
+// Debian: spellchecking needs additional packages to be installed, or calling external APIs
+//         see defaults.inc.php for additional informations
+$config['enable_spellcheck'] = false;

diff --git a/roundcube/debian-db.php b/roundcube/debian-db.php
new file mode 100644 (file)
index 0000000..5d628a2
--- /dev/null
+++ b/roundcube/debian-db.php
@@ -0,0 +1,10 @@
+<?php
+
+$dbtype = 'mysqli';
+$dbuser = 'roundcube';
+$dbpass = 'BHuc0I4uoPkDBSCtx9s6pSHMDKjguu2W';
+$dbserver = '127.0.0.1';
+$dbport = 3306;
+$dbname = 'roundcubemail';
+
+?>