Update to the latest changes in HyperKitty
This commit is contained in:
parent
7914a6192f
commit
1e7869952d
11 changed files with 120 additions and 123 deletions
|
@ -1,4 +1,4 @@
|
|||
#!/usr/bin/env python
|
||||
#!/usr/bin/env python2
|
||||
# vim: et ts=4 sw=4 fileencoding=utf-8
|
||||
|
||||
"""
|
||||
|
@ -57,22 +57,22 @@ def main():
|
|||
site.addsitedir(conf["confdir"])
|
||||
import settings_admin
|
||||
|
||||
# KittyStore
|
||||
dbspec = re.match("""
|
||||
postgresql://
|
||||
(?P<user>[a-z]+)
|
||||
:
|
||||
(?P<password>[^@]+)
|
||||
@
|
||||
(?P<host>[^/]+)
|
||||
/
|
||||
(?P<database>[^/?]+)
|
||||
""", settings_admin.KITTYSTORE_URL, re.X)
|
||||
give_rights(dbspec.group("host"),
|
||||
dbspec.group("user"),
|
||||
dbspec.group("password"),
|
||||
dbspec.group("database")
|
||||
)
|
||||
## KittyStore
|
||||
#dbspec = re.match("""
|
||||
# postgresql://
|
||||
# (?P<user>[a-z]+)
|
||||
# :
|
||||
# (?P<password>[^@]+)
|
||||
# @
|
||||
# (?P<host>[^/]+)
|
||||
# /
|
||||
# (?P<database>[^/?]+)
|
||||
# """, settings_admin.KITTYSTORE_URL, re.X)
|
||||
#give_rights(dbspec.group("host"),
|
||||
# dbspec.group("user"),
|
||||
# dbspec.group("password"),
|
||||
# dbspec.group("database")
|
||||
# )
|
||||
|
||||
# HyperKitty
|
||||
give_rights(
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue