scottk/Mailu-OIDC
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/Mailu-OIDC.git synced 2025-10-31 18:18:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Process nextgens review remarks

Browse Source
This commit is contained in:
Dimitri Huisman
2022-11-10 20:03:26 +01:00
parent 92f270c94e
commit 2a894cb15d
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webmails/roundcube/Dockerfile
View File

@@ -43,7 +43,7 @@ COPY config/config.inc.php /conf/config.inc.php
COPY login/mailu.php /var/www/webmail/plugins/mailu/mailu.php COPY login/mailu.php /var/www/webmail/plugins/mailu/mailu.php
COPY config/config.inc.carddav.php /var/www/webmail/plugins/carddav/config.inc.php COPY config/config.inc.carddav.php /var/www/webmail/plugins/carddav/config.inc.php
COPY start.py / COPY start.py /start.py
EXPOSE 80/tcp EXPOSE 80/tcp
VOLUME /data VOLUME /data

1
webmails/roundcube/config/nginx-roundcube.conf
View File

@@ -52,6 +52,7 @@ server {
location = /ping { location = /ping {
allow 127.0.0.1; allow 127.0.0.1;
allow ::1;
deny all; deny all;
include /etc/nginx/fastcgi_params; include /etc/nginx/fastcgi_params;

4
webmails/roundcube/start.py
View File

@@ -61,7 +61,7 @@ else:
context["PLUGINS"] = ",".join(f"'{p}'" for p in plugins) context["PLUGINS"] = ",".join(f"'{p}'" for p in plugins)
# add overrides # add overrides
context["INCLUDES"] = sorted(inc for inc in os.listdir("/overrides") if inc.endswith(".inc")) if os.path.isdir("/overrides") else [] context["INCLUDES"] = sorted(inc for inc in os.listdir("/overrides") if inc.endswith((".inc", ".inc.php"))) if os.path.isdir("/overrides") else []
# calculate variables for config file # calculate variables for config file
context["SESSION_TIMEOUT_MINUTES"] = max(int(env.get("SESSION_TIMEOUT", "3600")) // 60, 1) context["SESSION_TIMEOUT_MINUTES"] = max(int(env.get("SESSION_TIMEOUT", "3600")) // 60, 1)
@@ -81,7 +81,7 @@ try:
except subprocess.CalledProcessError as exc: except subprocess.CalledProcessError as exc:
err = exc.stdout.decode() err = exc.stdout.decode()
if "already exists" in err: if "already exists" in err:
print("Already initialzed") print("Already initialized")
else: else:
print(err) print(err)
exit(3) exit(3)