diff options
| author | Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> | 2012-05-06 00:17:19 +0100 |
|---|---|---|
| committer | Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> | 2012-05-06 00:17:19 +0100 |
| commit | a71c738585d0d169f5e03f8e51296f9d89cff933 (patch) | |
| tree | 017538145fd65fc90673cd357052db5df5f52de9 | |
| parent | 06cf3d5976d3a495d2ccce1b71bddc2465368bba (diff) | |
| download | pykolab-a71c738585d0d169f5e03f8e51296f9d89cff933.tar.gz | |
Correct paths for freebusy configuration
| -rw-r--r-- | pykolab/setup/setup_freebusy.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/pykolab/setup/setup_freebusy.py b/pykolab/setup/setup_freebusy.py index 6dbecab..0c66a17 100644 --- a/pykolab/setup/setup_freebusy.py +++ b/pykolab/setup/setup_freebusy.py @@ -54,17 +54,17 @@ def execute(*args, **kw): } want_files = [ - 'conf.d/10-kolab_conf_base.php', + 'config.php', ] for want_file in want_files: template_file = None - if os.path.isfile('/etc/kolab/templates/horde/%s.tpl' % (want_file)): - template_file = '/etc/kolab/templates/horde/%s.tpl' % (want_file) - elif os.path.isfile('/usr/share/kolab/templates/horde/%s.tpl' % (want_file)): - template_file = '/usr/share/kolab/templates/horde/%s.tpl' % (want_file) - elif os.path.isfile(os.path.abspath(os.path.join(__file__, '..', '..', '..', 'share', 'templates', 'horde', '%s.tpl' % (want_file)))): - template_file = os.path.abspath(os.path.join(__file__, '..', '..', '..', 'share', 'templates', 'horde', '%s.tpl' % (want_file))) + if os.path.isfile('/etc/kolab/templates/freebusy/%s.tpl' % (want_file)): + template_file = '/etc/kolab/templates/freebusy/%s.tpl' % (want_file) + elif os.path.isfile('/usr/share/kolab/templates/freebusy/%s.tpl' % (want_file)): + template_file = '/usr/share/kolab/templates/freebusy/%s.tpl' % (want_file) + elif os.path.isfile(os.path.abspath(os.path.join(__file__, '..', '..', '..', 'share', 'templates', 'freebusy', '%s.tpl' % (want_file)))): + template_file = os.path.abspath(os.path.join(__file__, '..', '..', '..', 'share', 'templates', 'freebusy', '%s.tpl' % (want_file))) if not template_file == None: log.debug(_("Using template file %r") % (template_file), level=8) @@ -72,16 +72,16 @@ def execute(*args, **kw): template_definition = fp.read() fp.close() - t = Template(template_definition, searchList=[horde_settings]) + t = Template(template_definition, searchList=[freebusy_settings]) log.debug( _("Successfully compiled template %r, writing out to %r") % ( template_file, - '/etc/horde/%s' % (want_file) + '/etc/kolab/freebusy/%s' % (want_file) ), level=8 ) - fp = open('/etc/horde/%s' % (want_file), 'w') + fp = open('/etc/kolab/freebusy/%s' % (want_file), 'w') fp.write(t.__str__()) fp.close() |