From 812fbe87c4d678384f01c6c1693d19d1a877feb1 Mon Sep 17 00:00:00 2001
From: Sebastian Hugentobler <sebastian@vanwa.ch>
Date: Wed, 24 Aug 2016 14:22:25 +0200
Subject: [PATCH] remove managesieve plugin

---
 Dockerfile                                                 | 2 +-
 rootfs/etc/confd/conf.d/managesieve-config.inc.php.toml    | 6 ------
 rootfs/etc/confd/templates/config.inc.php.tmpl             | 2 +-
 rootfs/etc/confd/templates/managesieve-config.inc.php.tmpl | 4 ----
 4 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 rootfs/etc/confd/conf.d/managesieve-config.inc.php.toml
 delete mode 100644 rootfs/etc/confd/templates/managesieve-config.inc.php.tmpl

diff --git a/Dockerfile b/Dockerfile
index fcf39bd..ac010f1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,7 +25,7 @@ RUN apk add --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/test
 RUN ln -s /usr/bin/php7 /usr/bin/php
 
 RUN mkdir /var/lib/roundcube
-RUN wget -qO- https://github.com/roundcube/roundcubemail/releases/download/1.2.0/roundcubemail-1.2.0-complete.tar.gz | tar xz -C /var/lib/roundcube --strip 1
+RUN wget -qO- https://github.com/roundcube/roundcubemail/releases/download/1.2.1/roundcubemail-1.2.1-complete.tar.gz | tar xz -C /var/lib/roundcube --strip 1
 RUN chown -R nginx:nginx /var/lib/roundcube
 
 RUN mkdir /run/nginx
diff --git a/rootfs/etc/confd/conf.d/managesieve-config.inc.php.toml b/rootfs/etc/confd/conf.d/managesieve-config.inc.php.toml
deleted file mode 100644
index 5aef3b6..0000000
--- a/rootfs/etc/confd/conf.d/managesieve-config.inc.php.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-[template]
-src = "managesieve-config.inc.php.tmpl"
-dest = "/var/lib/roundcube/plugins/managesieve/config.inc.php"
-gid = 101
-uid = 100
-mode = "0660"
diff --git a/rootfs/etc/confd/templates/config.inc.php.tmpl b/rootfs/etc/confd/templates/config.inc.php.tmpl
index bd513c7..ba58691 100644
--- a/rootfs/etc/confd/templates/config.inc.php.tmpl
+++ b/rootfs/etc/confd/templates/config.inc.php.tmpl
@@ -34,7 +34,7 @@ $config['username_domain'] = '%d';
 $config['username_domain_forced'] = true;
 $config['password_charset'] = 'UTF-8';
 
-$config['plugins'] = array('managesieve', 'password', 'archive', 'zipdownload');
+$config['plugins'] = array('password', 'archive', 'zipdownload');
 
 $config['spellcheck_engine'] = 'pspell';
 $config['default_charset'] = 'UTF-8';
diff --git a/rootfs/etc/confd/templates/managesieve-config.inc.php.tmpl b/rootfs/etc/confd/templates/managesieve-config.inc.php.tmpl
deleted file mode 100644
index 7ae5dbc..0000000
--- a/rootfs/etc/confd/templates/managesieve-config.inc.php.tmpl
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$config['managesieve_port'] = 4190;
-$config['managesieve_host'] = '{{getenv "DOVECOTHOST"}}';