diff --git a/webmails/roundcube/Dockerfile b/webmails/roundcube/Dockerfile index f9504617..c7da51b3 100644 --- a/webmails/roundcube/Dockerfile +++ b/webmails/roundcube/Dockerfile @@ -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 config/config.inc.carddav.php /var/www/webmail/plugins/carddav/config.inc.php -COPY start.py / +COPY start.py /start.py EXPOSE 80/tcp VOLUME /data diff --git a/webmails/roundcube/config/nginx-roundcube.conf b/webmails/roundcube/config/nginx-roundcube.conf index 8806fbf0..80268340 100644 --- a/webmails/roundcube/config/nginx-roundcube.conf +++ b/webmails/roundcube/config/nginx-roundcube.conf @@ -52,6 +52,7 @@ server { location = /ping { allow 127.0.0.1; + allow ::1; deny all; include /etc/nginx/fastcgi_params; diff --git a/webmails/roundcube/start.py b/webmails/roundcube/start.py index 153c9447..12b2b44b 100755 --- a/webmails/roundcube/start.py +++ b/webmails/roundcube/start.py @@ -61,7 +61,7 @@ else: 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 [] +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 context["SESSION_TIMEOUT_MINUTES"] = max(int(env.get("SESSION_TIMEOUT", "3600")) // 60, 1) @@ -81,7 +81,7 @@ try: except subprocess.CalledProcessError as exc: err = exc.stdout.decode() if "already exists" in err: - print("Already initialzed") + print("Already initialized") else: print(err) exit(3)