8 commits - configure.ac pykolab/setup share/Makefile.am
Jeroen van Meeuwen
vanmeeuwen at kolabsys.com
Sun May 6 18:57:53 CEST 2012
configure.ac | 4 +--
pykolab/setup/setup_freebusy.py | 42 +++++++---------------------------------
share/Makefile.am | 1
3 files changed, 11 insertions(+), 36 deletions(-)
New commits:
commit 4425c58b3de6a89acace9c15c97714ad0ff4011b
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Sun May 6 17:57:04 2012 +0100
Release 0.4.0-1
diff --git a/configure.ac b/configure.ac
index a4e008b..99346cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
-AC_INIT([pykolab], 0.4)
-AC_SUBST([RELEASE], 0.19)
+AC_INIT([pykolab], 0.4.0)
+AC_SUBST([RELEASE], 1)
AC_CONFIG_SRCDIR(pykolab/constants.py.in)
commit a6e0cdd6eee09dfe6b5da6ba5a5f673556d4a661
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Sun May 6 17:56:24 2012 +0100
Use correct variable name for freebusy template
diff --git a/pykolab/setup/setup_freebusy.py b/pykolab/setup/setup_freebusy.py
index 2bca22b..5c4b2e7 100644
--- a/pykolab/setup/setup_freebusy.py
+++ b/pykolab/setup/setup_freebusy.py
@@ -56,7 +56,7 @@ def execute(*args, **kw):
'ldap_service_bind_dn': conf.get('ldap', 'service_bind_dn'),
'ldap_service_bind_pw': conf.get('ldap', 'service_bind_pw'),
'primary_domain': conf.get('kolab', 'primary_domain'),
- 'roundcube_mysql_password': conf.mysql_roundcube_password
+ 'mysql_roundcube_password': conf.mysql_roundcube_password
}
want_files = [
commit 7007aea484e33ba130594c42c876cd10eba9a469
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Sun May 6 13:41:25 2012 +0100
Bump pre-release
diff --git a/configure.ac b/configure.ac
index 169790f..a4e008b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_INIT([pykolab], 0.4)
-AC_SUBST([RELEASE], 0.18)
+AC_SUBST([RELEASE], 0.19)
AC_CONFIG_SRCDIR(pykolab/constants.py.in)
commit e9cb83fec2eb700e530df77ec0b32dcbf9e3cf99
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Sun May 6 13:41:06 2012 +0100
Correct variable name
diff --git a/pykolab/setup/setup_freebusy.py b/pykolab/setup/setup_freebusy.py
index 4a5a282..2bca22b 100644
--- a/pykolab/setup/setup_freebusy.py
+++ b/pykolab/setup/setup_freebusy.py
@@ -50,7 +50,7 @@ def execute(*args, **kw):
password=True
)
- horde_settings = {
+ freebusy_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'),
commit 66cb2b091c3e59abc5aa9fc413f059b6837b6deb
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Sun May 6 11:53:35 2012 +0100
Bump pre-release
diff --git a/configure.ac b/configure.ac
index 8e67488..169790f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_INIT([pykolab], 0.4)
-AC_SUBST([RELEASE], 0.17)
+AC_SUBST([RELEASE], 0.18)
AC_CONFIG_SRCDIR(pykolab/constants.py.in)
commit 3507c91d8308870637245e54e6d8acec1208ca53
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Sun May 6 11:53:10 2012 +0100
Correct duplication in setup_freebusy
diff --git a/pykolab/setup/setup_freebusy.py b/pykolab/setup/setup_freebusy.py
index 0c66a17..4a5a282 100644
--- a/pykolab/setup/setup_freebusy.py
+++ b/pykolab/setup/setup_freebusy.py
@@ -44,6 +44,12 @@ def execute(*args, **kw):
log.error(_("Free/Busy is not installed on this system"))
return
+ if not hasattr(conf, 'mysql_roundcube_password'):
+ conf.mysql_roundcube_password = utils.ask_question(
+ _("MySQL roundcube password"),
+ password=True
+ )
+
horde_settings = {
'ldap_base_dn': conf.get('ldap', 'base_dn'),
'ldap_ldap_uri': conf.get('ldap', 'ldap_uri'),
@@ -85,38 +91,6 @@ def execute(*args, **kw):
fp.write(t.__str__())
fp.close()
- want_files = [
- 'config.php',
- ]
-
- for want_file in want_files:
- template_file = None
- 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)
- fp = open(template_file, 'r')
- template_definition = fp.read()
- fp.close()
-
- t = Template(template_definition, searchList=[freebusy_settings])
- log.debug(
- _("Successfully compiled template %r, writing out to %r") % (
- template_file,
- '/etc/freebusy/%s' % (want_file)
- ),
- level=8
- )
-
- fp = open('/etc/kolab/freebusy/%s' % (want_file), 'w')
- fp.write(t.__str__())
- fp.close()
-
if os.path.isfile('/bin/systemctl'):
subprocess.call(['/bin/systemctl', 'restart', 'httpd.service'])
subprocess.call(['/bin/systemctl', 'enable', 'httpd.service'])
commit 9bc25577dfaa1235b6971affe8bd9f566ea261e9
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Sun May 6 11:52:20 2012 +0100
Add fbtemplate_DATA
diff --git a/share/Makefile.am b/share/Makefile.am
index 364bd36..4bfff10 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -20,6 +20,7 @@ zpushtemplate_DATA = \
EXTRA_DIST = \
$(template_DATA) \
+ $(fbtemplate_DATA) \
$(hordetemplate_DATA) \
$(rctemplate_DATA) \
$(zpushtemplate_DATA)
commit 0c060b48212616874bc2984e67509fb4989c1d1e
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Sun May 6 00:17:52 2012 +0100
Bump pre-release
diff --git a/configure.ac b/configure.ac
index a0d03ed..8e67488 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_INIT([pykolab], 0.4)
-AC_SUBST([RELEASE], 0.16)
+AC_SUBST([RELEASE], 0.17)
AC_CONFIG_SRCDIR(pykolab/constants.py.in)
More information about the commits
mailing list