Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 847d2432 authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

fix serverName error on console

parent d8cd5967

Dockerfile

+14 −10
Original line number Diff line number Diff line
@@ -2,16 +2,16 @@ FROM nextcloud:31.0.10-fpm AS nextcloud 
ARG BASE_DIR="/usr/src/nextcloud"

ARG TMP_PATCH_DIR="/tmp/build_patches"



ARG CONTACTS_URL="https://gitlab.e.foundation/api/v4/projects/1238/packages/generic/contacts/v7.2.0+murena-20250926/contacts-v7.2.0+murena-20250926.tar.gz"

ARG CONTACTS_URL="https://gitlab.e.foundation/api/v4/projects/1238/packages/generic/contacts/v7.2.0+murena-20251111/contacts-v7.2.0+murena-20251111.tar.gz"

ARG CALENDAR_URL="https://gitlab.e.foundation/api/v4/projects/1199/packages/generic/calendar/v5.3.5+murena-20251016/calendar-v5.3.5+murena-20251016.tar.gz"

ARG THEME_HELPER_URL="https://gitlab.e.foundation/api/v4/projects/952/packages/generic/ecloud-theme-helper/v9.0.0/ecloud-theme-helper-v9.0.0.tar.gz"

ARG LAUNCHER_URL="https://gitlab.e.foundation/api/v4/projects/927/packages/generic/murena_launcher/v9.0.0/murena_launcher-v9.0.0.tar.gz"

ARG DASHBOARD_URL="https://gitlab.e.foundation/api/v4/projects/1195/packages/generic/murena-dashboard/v9.0.0/murena-dashboard-v9.0.0.tar.gz"

ARG SNAPPY_URL="https://gitlab.e.foundation/api/v4/projects/1367/packages/generic/snappymail/v2.38.2+murena-20250822/snappymail-v2.38.2+murena-20250822.tar.gz"

ARG SNAPPY_URL="https://gitlab.e.foundation/api/v4/projects/1367/packages/generic/snappymail/v2.38.2+murena-20251112/snappymail-v2.38.2+murena-20251112.tar.gz"

ARG OIDC_LOGIN_URL="https://gitlab.e.foundation/api/v4/projects/1496/packages/generic/oidc_login/v3.2.2+murena-20251028/oidc_login-v3.2.2+murena-20251028.tar.gz"

ARG SNAPPY_THEME_VERSION="https://gitlab.e.foundation/api/v4/projects/1377/packages/generic/snappymail/v4.0.5/snappymail-v4.0.5.tar.gz"

ARG EA_URL="https://gitlab.e.foundation/api/v4/projects/648/packages/generic/ecloud-accounts/v13.0.0/ecloud-accounts-v13.0.0.tar.gz"

ARG EMAIL_RECOVERY_URL="https://gitlab.e.foundation/api/v4/projects/868/packages/generic/email-recovery/v12.1.0/email-recovery-v12.1.0.tar.gz"

ARG EMAIL_RECOVERY_URL="https://gitlab.e.foundation/api/v4/projects/868/packages/generic/email-recovery/v12.2.0/email-recovery-v12.2.0.tar.gz"

ARG USER_MIGRATION_URL="https://gitlab.e.foundation/api/v4/projects/1468/packages/generic/user_migration/8.0.0+murena-20251020/user_migration-8.0.0+murena-20251020.tar.gz"



ARG NOTES_URL="https://github.com/nextcloud-releases/notes/releases/download/v4.11.0/notes-v4.11.0.tar.gz"
@@ -19,7 +19,7 @@ ARG MEMORIES_URL="https://github.com/pulsejet/memories/releases/download/v7.5.2/ 
ARG DROP_ACCOUNT_URL="https://packages.framasoft.org/projects/nextcloud-apps/drop-account/drop_account-2.7.1.tar.gz"

ARG GOOGLE_INTEGRATION_URL="https://github.com/nextcloud/integration_google/releases/download/v1.0.9/integration_google-1.0.9.tar.gz"



RUN sed -i 's/31,0,10,2/31,0,10,4/' ${BASE_DIR}/version.php

RUN sed -i 's/31,0,10,2/31,0,10,8/' ${BASE_DIR}/version.php

COPY custom_entrypoint.sh /

RUN chmod +x /custom_entrypoint.sh

RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images
@@ -30,7 +30,8 @@ RUN apt-get update && apt-get install -y unzip ffmpeg 
RUN rm -rf ${BASE_DIR}/core/skeleton/* ${BASE_DIR}/themes/example \

 && mkdir -p ${BASE_DIR}/core/skeleton/Documents \

 && mkdir -p ${BASE_DIR}/core/skeleton/Images \

 && mkdir -p ${BASE_DIR}/themes/Murena

 && mkdir -p ${BASE_DIR}/themes/Murena \

 && mkdir -p ${BASE_DIR}/themes/eCloud



# Install unzip for unzipping artifacts

RUN apt-get update && apt-get install -y unzip ffmpeg syslog-ng
@@ -60,7 +61,8 @@ RUN curl -sL ${GOOGLE_INTEGRATION_URL} | tar xzf - -C ${BASE_DIR}/custom_apps 
#RUN sed -i "s/'additional'/null/" ${BASE_DIR}/custom_apps/snappymail/lib/Settings/PersonalSettings.php



# Snappy theme

RUN curl -sL ${SNAPPY_THEME_VERSION} | tar xzf - -C ${BASE_DIR}/themes/Murena/

RUN rm -rf ${BASE_DIR}/themes/Murena/* && \

    curl -sL ${SNAPPY_THEME_VERSION} | tar xzf - -C ${BASE_DIR}/themes/Murena/





# Remove unzip when unzipping is done
@@ -107,7 +109,8 @@ RUN cd ${BASE_DIR} && patch -p1 < ${TMP_PATCH_DIR}/036-user-config-change-event. 
RUN rm -rf ${TMP_PATCH_DIR}



# Custom theme

RUN curl -sL ${THEME_VERSION} | tar xzf - -C ${BASE_DIR}/themes

RUN rm -rf ${BASE_DIR}/themes/eCloud && \

    curl -sL ${THEME_VERSION} | tar xzf - -C ${BASE_DIR}/themes





# User Backend
@@ -149,7 +152,7 @@ RUN sed -i "s/\['total'\]/\['quota'\]/" ${BASE_DIR}/apps/provisioning_api/lib/Co 
From selfhost as ecloud

ARG BASE_DIR="/usr/src/nextcloud"

ARG TMP_PATCH_DIR="/tmp/build_patches"

ARG THEME_VERSION="https://gitlab.e.foundation/api/v4/projects/315/packages/generic/eCloud/v31.0.2/eCloud-v31.0.2.tar.gz"

ARG THEME_VERSION="https://gitlab.e.foundation/api/v4/projects/315/packages/generic/eCloud/v31.0.3/eCloud-v31.0.3.tar.gz"

ARG LDAP_WRITE_SUPPORT_VERSION="1.13.0"

ARG IS_SELFHOST=false
@@ -172,7 +175,7 @@ RUN patch -u ${BASE_DIR}/apps/dav/lib/HookManager.php -i ${TMP_PATCH_DIR}/028-de 
RUN patch -u ${BASE_DIR}/apps/provisioning_api/lib/Controller/UsersController.php -i ${TMP_PATCH_DIR}/029-restrict-user-to-change-primary-email.patch

RUN patch -u ${BASE_DIR}/lib/private/Security/VerificationToken/VerificationToken.php -i ${TMP_PATCH_DIR}/033-verification-token-private.patch

RUN patch -u ${BASE_DIR}/lib/private/AppFramework/Middleware/Security/CORSMiddleware.php -i ${TMP_PATCH_DIR}/034-oidc-bearer-token-auth.patch

RUN patch -u ${BASE_DIR}/custom_apps/snappymail/app/snappymail/v/2.38.2+murena-20250822/app/libraries/RainLoop/Actions/Contacts.php -i ${TMP_PATCH_DIR}/037-snappymail-contact.patch

RUN patch -u ${BASE_DIR}/custom_apps/snappymail/app/snappymail/v/2.38.2+murena-20251112/app/libraries/RainLoop/Actions/Contacts.php -i ${TMP_PATCH_DIR}/037-snappymail-contact.patch

RUN rm -rf ${TMP_PATCH_DIR}
@@ -222,7 +225,8 @@ RUN sed -i 's/{attrs:{name:t.t("theming","Navigation bar settings")}}/{staticCla 




# Custom theme

RUN curl -sL ${THEME_VERSION} | tar xzf - -C ${BASE_DIR}/themes

RUN rm -rf ${BASE_DIR}/themes/eCloud && \

    curl -sL ${THEME_VERSION} | tar xzf - -C ${BASE_DIR}/themes



# Remove Selfhost theme

RUN if [ "$IS_SELFHOST" = false ]; then \

patches/011-privacy-settings.patch

+11 −0
Original line number Diff line number Diff line
@@ -4,6 +4,17 @@ Subject: [PATCH] Removes sections in "privacy" section in personal settings 


This patch removes certain unnecessary sections from the "privacy" section in personal settings



--- ./apps/privacy/lib/Settings/WhoHasAccessSettings.php	2025-11-05 00:20:31

+++ ./apps/privacy/lib/Settings/WhoHasAccessSettings-new.php	2025-11-05 00:21:36

@@ -77,6 +77,7 @@

 		$this->initialStateService->provideInitialState('privacy', 'serverSideEncryptionEnabled', $this->encryptionManager->isEnabled());

 		$this->initialStateService->provideInitialState('privacy', 'homeStorageEncryptionEnabled', $isHomeStorageEncrypted);

 		$this->initialStateService->provideInitialState('privacy', 'masterKeyEncryptionEnabled', $isMasterKeyEnabled);

+		$this->initialStateService->provideInitialState('privacy', 'serverName', $themingDefaults->getEntity());

 

 

 		return new TemplateResponse('privacy', 'who-has-access');



--- ./apps/privacy/lib/Settings/MissionSettings.php	2021-09-07 17:38:08.650902445 +0530

+++ ./apps/privacy/lib/Settings/MissionSettings-new.php	2021-09-07 17:40:30.078256502 +0530

@@ -36,7 +36,7 @@