Remove zpush and horde configuration

2 files changed, 2 insertions, 129 deletions

diff --git a/pykolab/setup/setup_zpush.py b/pykolab/setup/setup_zpush.py
deleted file mode 100644
index 4d1ce70..0000000
--- a/pykolab/setup/setup_zpush.py
+++ /dev/null
@@ -1,109 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright 2010-2013 Kolab Systems AG (http://www.kolabsys.com)
-#
-# Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen a kolabsys.com>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; version 3 or, at your option, any later version
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Library General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-
-from Cheetah.Template import Template
-import os
-import subprocess
-import sys
-import time
-
-import components
-
-import pykolab
-
-from pykolab import utils
-from pykolab.constants import *
-from pykolab.translate import _
-
-log = pykolab.getLogger('pykolab.setup')
-conf = pykolab.getConf()
-
-def __init__():
-    components.register('zpush', execute, description=description(), after=['mysql','ldap'])
-
-def description():
-    return _("Setup zpush.")
-
-def execute(*args, **kw):
-    if not os.path.isfile('/etc/z-push/config.php'):
-        log.error(_("Z-Push is not installed on this system"))
-        return
-
-    zpush_settings = {
-            'ldap_base_dn': conf.get('ldap', 'base_dn'),
-            'ldap_ldap_uri': conf.get('ldap', 'ldap_uri'),
-            'ldap_service_bind_dn': conf.get('ldap', 'service_bind_dn'),
-            'ldap_service_bind_pw': conf.get('ldap', 'service_bind_pw'),
-            'imap_server': "localhost"
-        }
-
-
-    want_files = [
-            'config.php',
-        ]
-
-    for want_file in want_files:
-        template_file = None
-        if os.path.isfile('/etc/kolab/templates/zpush/%s.tpl' % (want_file)):
-            template_file = '/etc/kolab/templates/zpush/%s.tpl' % (want_file)
-        elif os.path.isfile('/usr/share/kolab/templates/zpush/%s.tpl' % (want_file)):
-            template_file = '/usr/share/kolab/templates/zpush/%s.tpl' % (want_file)
-        elif os.path.isfile(os.path.abspath(os.path.join(__file__, '..', '..', '..', 'share', 'templates', 'zpush', '%s.tpl' % (want_file)))):
-            template_file = os.path.abspath(os.path.join(__file__, '..', '..', '..', 'share', 'templates', 'zpush', '%s.tpl' % (want_file)))
-
-        if not template_file == None:
-            log.debug(_("Using template file %r") % (template_file), level=8)
-            fp = open(template_file, 'r')
-            template_definition = fp.read()
-            fp.close()
-
-            t = Template(template_definition, searchList=[zpush_settings])
-            log.debug(
-                    _("Successfully compiled template %r, writing out to %r") % (
-                            template_file,
-                            '/etc/z-push/%s' % (want_file)
-                        ),
-                    level=8
-                )
-
-            fp = open('/etc/z-push/%s' % (want_file), 'w')
-            fp.write(t.__str__())
-            fp.close()
-
-    time.sleep(2)
-
-    if os.path.isfile('/bin/systemctl'):
-        subprocess.call(['/bin/systemctl', 'restart', 'httpd.service'])
-    elif os.path.isfile('/sbin/service'):
-        subprocess.call(['/sbin/service', 'httpd', 'restart'])
-    elif os.path.isfile('/usr/sbin/service'):
-        subprocess.call(['/usr/sbin/service','apache2','restart'])
-    else:
-        log.error(_("Could not start the webserver server service."))
-
-    if os.path.isfile('/bin/systemctl'):
-        subprocess.call(['/bin/systemctl', 'enable', 'httpd.service'])
-    elif os.path.isfile('/sbin/chkconfig'):
-        subprocess.call(['/sbin/chkconfig', 'httpd', 'on'])
-    elif os.path.isfile('/usr/sbin/update-rc.d'):
-        subprocess.call(['/usr/sbin/update-rc.d', 'apache2', 'defaults'])
-    else:
-        log.error(_("Could not configure to start on boot, the " + \
-                "webserver server service."))
-
diff --git a/share/Makefile.am b/share/Makefile.am
index 4bfff10..b3174e1 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -2,34 +2,16 @@ templatedir = $(datadir)/kolab/templates
 template_DATA = \
 	$(wildcard templates/*.tpl)
 
-fbtemplatedir = $(datadir)/kolab/templates/freebusy
-fbtemplate_DATA = \
-	$(wildcard templates/freebusy/*.tpl)
-
-hordetemplatedir = $(datadir)/kolab/templates/horde/conf.d/
-hordetemplate_DATA = \
-	$(wildcard templates/horde/conf.d/*.tpl)
-
 rctemplatedir = $(datadir)/kolab/templates/roundcubemail
 rctemplate_DATA = \
 	$(wildcard templates/roundcubemail/*.tpl)
 
-zpushtemplatedir = $(datadir)/kolab/templates/zpush
-zpushtemplate_DATA = \
-	$(wildcard templates/zpush/*.tpl)
-
 EXTRA_DIST = \
 	$(template_DATA) \
-	$(fbtemplate_DATA) \
-	$(hordetemplate_DATA) \
-	$(rctemplate_DATA) \
-	$(zpushtemplate_DATA)
+	$(rctemplate_DATA)
 
 install-exec-local:
 	mkdir -p \
 		$(DESTDIR)/$(sysconfdir)/kolab/templates \
-		$(DESTDIR)/$(sysconfdir)/kolab/templates/freebusy \
-		$(DESTDIR)/$(sysconfdir)/kolab/templates/horde/conf.d \
-		$(DESTDIR)/$(sysconfdir)/kolab/templates/roundcubemail \
-		$(DESTDIR)/$(sysconfdir)/kolab/templates/zpush
+		$(DESTDIR)/$(sysconfdir)/kolab/templates/roundcubemail