Merge #2035
2035: updated roundcube to 1.5.1 and carddav to 4.3.0 r=mergify[bot] a=ghostwheel42 ## What type of PR? enhancement ## What does this PR do? updated roundcube to 1.5 and carddav to 4.2.2 also runs cleanup cronjob _once_ at startup ### Related issue(s) - closes #2031 - runs cleanup job mentioned in #1702 at startup ## Prerequisites Before we can consider review and merge, please make sure the following list is done and checked. If an entry in not applicable, you can check it or remove it from the list. - [X] In case of feature or enhancement: documentation updated accordingly - [X] Unless it's docs or a minor change: add [changelog](https://mailu.io/master/contributors/workflow.html#changelog) entry file. Co-authored-by: Alexander Graf <ghostwheel42@users.noreply.github.com>master
bors[bot]
3 years ago
committed by
GitHub
commit
c5966b29db
@ -0,0 +1 @@
|
|||||||
|
updated roundcube to 1.5 and carddav to 4.2.2 using php8
|
||||||
@ -0,0 +1,2 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
SCRIPT_NAME=/ping SCRIPT_FILENAME=/ping REQUEST_METHOD=GET cgi-fcgi -bind -connect 127.0.0.1:9000 2>/dev/null | grep -qFx pong
|
||||||
@ -1,61 +1,105 @@
|
|||||||
#!/usr/bin/python3
|
#!/usr/bin/python3
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import logging as log
|
import logging
|
||||||
import sys
|
import sys
|
||||||
from socrate import conf
|
from socrate import conf
|
||||||
import subprocess
|
import subprocess
|
||||||
|
import hmac
|
||||||
|
|
||||||
log.basicConfig(stream=sys.stderr, level=os.environ.get("LOG_LEVEL", "WARNING"))
|
env = os.environ
|
||||||
|
|
||||||
os.environ["MAX_FILESIZE"] = str(int(int(os.environ.get("MESSAGE_SIZE_LIMIT")) * 0.66 / 1048576))
|
logging.basicConfig(stream=sys.stderr, level=env.get("LOG_LEVEL", "WARNING"))
|
||||||
|
|
||||||
db_flavor = os.environ.get("ROUNDCUBE_DB_FLAVOR", "sqlite")
|
# jinja context
|
||||||
|
context = {}
|
||||||
|
context.update(env)
|
||||||
|
|
||||||
|
context["MAX_FILESIZE"] = str(int(int(env.get("MESSAGE_SIZE_LIMIT", "50000000")) * 0.66 / 1048576))
|
||||||
|
|
||||||
|
db_flavor = env.get("ROUNDCUBE_DB_FLAVOR", "sqlite")
|
||||||
if db_flavor == "sqlite":
|
if db_flavor == "sqlite":
|
||||||
os.environ["DB_DSNW"] = "sqlite:////data/roundcube.db"
|
context["DB_DSNW"] = "sqlite:////data/roundcube.db"
|
||||||
elif db_flavor == "mysql":
|
elif db_flavor == "mysql":
|
||||||
os.environ["DB_DSNW"] = "mysql://%s:%s@%s/%s" % (
|
context["DB_DSNW"] = "mysql://%s:%s@%s/%s" % (
|
||||||
os.environ.get("ROUNDCUBE_DB_USER", "roundcube"),
|
env.get("ROUNDCUBE_DB_USER", "roundcube"),
|
||||||
os.environ.get("ROUNDCUBE_DB_PW"),
|
env.get("ROUNDCUBE_DB_PW"),
|
||||||
os.environ.get("ROUNDCUBE_DB_HOST", "database"),
|
env.get("ROUNDCUBE_DB_HOST", "database"),
|
||||||
os.environ.get("ROUNDCUBE_DB_NAME", "roundcube")
|
env.get("ROUNDCUBE_DB_NAME", "roundcube")
|
||||||
)
|
)
|
||||||
elif db_flavor == "postgresql":
|
elif db_flavor == "postgresql":
|
||||||
os.environ["DB_DSNW"] = "pgsql://%s:%s@%s/%s" % (
|
context["DB_DSNW"] = "pgsql://%s:%s@%s/%s" % (
|
||||||
os.environ.get("ROUNDCUBE_DB_USER", "roundcube"),
|
env.get("ROUNDCUBE_DB_USER", "roundcube"),
|
||||||
os.environ.get("ROUNDCUBE_DB_PW"),
|
env.get("ROUNDCUBE_DB_PW"),
|
||||||
os.environ.get("ROUNDCUBE_DB_HOST", "database"),
|
env.get("ROUNDCUBE_DB_HOST", "database"),
|
||||||
os.environ.get("ROUNDCUBE_DB_NAME", "roundcube")
|
env.get("ROUNDCUBE_DB_NAME", "roundcube")
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
print("Unknown ROUNDCUBE_DB_FLAVOR: %s", db_flavor)
|
print(f"Unknown ROUNDCUBE_DB_FLAVOR: {db_flavor}", file=sys.stderr)
|
||||||
exit(1)
|
exit(1)
|
||||||
|
|
||||||
conf.jinja("/php.ini", os.environ, "/usr/local/etc/php/conf.d/roundcube.ini")
|
# derive roundcube secret key
|
||||||
|
secret_key = env.get("SECRET_KEY")
|
||||||
|
if not secret_key:
|
||||||
|
try:
|
||||||
|
secret_key = open(env.get("SECRET_KEY_FILE"), "r").read().strip()
|
||||||
|
except Exception as exc:
|
||||||
|
print(f"Can't read SECRET_KEY from file: {exc}", file=sys.stderr)
|
||||||
|
exit(2)
|
||||||
|
|
||||||
# Create dirs, setup permissions
|
context['SECRET_KEY'] = hmac.new(bytearray(secret_key, 'utf-8'), bytearray('ROUNDCUBE_KEY', 'utf-8'), 'sha256').hexdigest()
|
||||||
|
|
||||||
|
# roundcube plugins
|
||||||
|
# (using "dict" because it is ordered and "set" is not)
|
||||||
|
plugins = dict((p, None) for p in env.get("ROUNDCUBE_PLUGINS", "").replace(" ", "").split(",") if p and os.path.isdir(os.path.join("/var/www/plugins", p)))
|
||||||
|
if plugins:
|
||||||
|
plugins["mailu"] = None
|
||||||
|
else:
|
||||||
|
plugins = dict((k, None) for k in ["archive", "zipdownload", "markasjunk", "managesieve", "enigma", "carddav", "mailu"])
|
||||||
|
|
||||||
|
context["PLUGINS"] = ",".join(f"'{p}'" for p in plugins)
|
||||||
|
|
||||||
|
# add overrides
|
||||||
|
context["INCLUDES"] = sorted(inc for inc in os.listdir("/overrides") if inc.endswith(".inc")) if os.path.isdir("/overrides") else []
|
||||||
|
|
||||||
|
# create config files
|
||||||
|
conf.jinja("/php.ini", context, "/usr/local/etc/php/conf.d/roundcube.ini")
|
||||||
|
conf.jinja("/config.inc.php", context, "/var/www/html/config/config.inc.php")
|
||||||
|
|
||||||
|
# create dirs
|
||||||
os.system("mkdir -p /data/gpg")
|
os.system("mkdir -p /data/gpg")
|
||||||
|
|
||||||
try:
|
|
||||||
print("Initializing database")
|
print("Initializing database")
|
||||||
|
try:
|
||||||
result = subprocess.check_output(["/var/www/html/bin/initdb.sh", "--dir", "/var/www/html/SQL"],
|
result = subprocess.check_output(["/var/www/html/bin/initdb.sh", "--dir", "/var/www/html/SQL"],
|
||||||
stderr=subprocess.STDOUT)
|
stderr=subprocess.STDOUT)
|
||||||
print(result.decode())
|
print(result.decode())
|
||||||
except subprocess.CalledProcessError as e:
|
except subprocess.CalledProcessError as exc:
|
||||||
if "already exists" in e.stdout.decode():
|
err = exc.stdout.decode()
|
||||||
|
if "already exists" in err:
|
||||||
print("Already initialzed")
|
print("Already initialzed")
|
||||||
else:
|
else:
|
||||||
print(e.stdout.decode())
|
print(err)
|
||||||
quit(1)
|
exit(3)
|
||||||
|
|
||||||
try:
|
|
||||||
print("Upgrading database")
|
print("Upgrading database")
|
||||||
|
try:
|
||||||
subprocess.check_call(["/var/www/html/bin/update.sh", "--version=?", "-y"], stderr=subprocess.STDOUT)
|
subprocess.check_call(["/var/www/html/bin/update.sh", "--version=?", "-y"], stderr=subprocess.STDOUT)
|
||||||
except subprocess.CalledProcessError as e:
|
except subprocess.CalledProcessError as exc:
|
||||||
quit(1)
|
exit(4)
|
||||||
|
else:
|
||||||
|
print("Cleaning database")
|
||||||
|
try:
|
||||||
|
subprocess.check_call(["/var/www/html/bin/cleandb.sh"], stderr=subprocess.STDOUT)
|
||||||
|
except subprocess.CalledProcessError as exc:
|
||||||
|
exit(5)
|
||||||
|
|
||||||
# Setup database permissions
|
# setup permissions
|
||||||
os.system("chown -R www-data:www-data /data")
|
os.system("chown -R www-data:www-data /data")
|
||||||
|
|
||||||
# Run apache
|
# clean env
|
||||||
os.execv("/usr/local/bin/apache2-foreground", ["apache2-foreground"])
|
[env.pop(key, None) for key in env.keys() if key == "SECRET_KEY" or key.startswith("ROUNDCUBE_")]
|
||||||
|
|
||||||
|
# run apache
|
||||||
|
os.execve("/usr/local/bin/apache2-foreground", ["apache2-foreground"], env)
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue