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

Verified Commit 596d42e1 authored by Nicolas Gelot's avatar Nicolas Gelot
Browse files

feat: rework murena slim config 

Use recommended dynmic config from nextcloud doc
https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/config_sample_php_parameters.html#multiple-merged-configuration-files
parent 630a0f60

config/nextcloud/murena.config.php

0 → 100644
+34 −0
Original line number Diff line number Diff line 
<?php

$CONFIG = array(

  'integrity.check.disabled' => true,

  'profile.enabled' => false,

  'defaultapp' => 'murena-dashboard,files',

  'theme' => 'eCloud',

  'filelocking.enabled' => true,

  'log_type' => 'syslog',

  'loglevel' => 2,

  'syslog_tag' => 'nextcloud',

  'cron_log' => true,

  'enabledPreviewProviders' => array(

    'OC\\Preview\\PNG',

    'OC\\Preview\\JPEG',

    'OC\\Preview\\GIF',

    'OC\\Preview\\BMP',

    'OC\\Preview\\XBitmap',

    'OC\\Preview\\MP3',

    'OC\\Preview\\TXT',

    'OC\\Preview\\MarkDown',

    'OC\\Preview\\OpenDocument',

    'OC\\Preview\\Krita',

    'OC\\Preview\\Movie',

  ),

  'preview_max_x' => 1024,

  'preview_max_y' => 1024,

  'default_phone_region' => getenv('NEXTCLOUD_DEFAULT_PHONE_REGION_CODE') ?: 'FR',

  'maintenance_window_start' => 1,

);



if (getenv('SENTRY_DSN') && getenv('SENTRY_PUBLIC_DSN')) {

  $CONFIG['sentry.dsn'] = getenv('SENTRY_DSN');

  $CONFIG['sentry.public-dsn'] = getenv('SENTRY_PUBLIC_DSN');

}

config/nextcloud/pgsql_ssl.config.php

0 → 100644
+9 −0
Original line number Diff line number Diff line 
<?php

if (getenv('POSTGRES_SSL_MODE')) {

  $CONFIG = array (

    'pgsql_ssl' => array(

      'mode' => getenv('POSTGRES_SSL_MODE'),  // see https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNECT-SSLMODE

      'rootcert' => getenv('POSTGRES_SSL_ROOTCERT') ?: null,

    ),

  );

}

docker-compose.local.yml

+1 −1
Original line number Diff line number Diff line 
services:

  db:

    image: postgres:17.4-alpine

    image: postgres:16.10-alpine

    restart: unless-stopped

    environment:

      - POSTGRES_DB=${DB_NAME}

hooks.d/post-installation/murena-config.json

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
{

  "system": {

    "profile.enabled": false,

    "defaultapp": "murena-dashboard,files",

    "theme": "eCloud",

    "filelocking.enabled": true,

    "log_type": "syslog",

    "loglevel": 2,

    "syslog_tag": "nextcloud",

    "cron_log": true,

    "enabledPreviewProviders": [

      "OC\\Preview\\PNG",

      "OC\\Preview\\JPEG",

      "OC\\Preview\\GIF",

      "OC\\Preview\\BMP",

      "OC\\Preview\\XBitmap",

      "OC\\Preview\\MP3",

      "OC\\Preview\\TXT",

      "OC\\Preview\\MarkDown",

      "OC\\Preview\\OpenDocument",

      "OC\\Preview\\Krita",

      "OC\\Preview\\Movie"

    ],

    "preview_max_x": 1024,

    "preview_max_y": 1024,

    "default_phone_region": "FR",

    "maintenance_window_start": 1,

    "sentry.dsn": "${SENTRY_DSN}",

    "sentry.public-dsn": "${SENTRY_PUBLIC_DSN}"

  }

}

hooks.d/post-installation/murena-theme.sh→hooks.d/post-installation/murena-config.sh

+6 −11
Original line number Diff line number Diff line
@@ -3,15 +3,10 @@ 
SCRIPT_DIR=$(dirname "$0")

PATH=${PATH}:/var/www/html



# Apply configuration

sed -e "s|\${SENTRY_DSN}|${SENTRY_DSN}|g" \

    -e "s|\${SENTRY_PUBLIC_DSN}|${SENTRY_PUBLIC_DSN}|g" \

    "${SCRIPT_DIR}/murena-config.json" | occ config:import



# Update theme

occ maintenance:theme:update



echo "Enabling nextcloud apps"

# Manage apps

occ app:enable contacts

occ app:enable calendar

occ app:enable ecloud-theme-helper
@@ -27,11 +22,11 @@ occ app:enable sentry 
occ app:disable firstrunwizard

occ app:disable logreader



echo "Performing some Nextcloud administrative tasks"

if [ -n "${MYSQL_DATABASE+x}" ]; then

  occ db:convert-mysql-charset

fi

occ db:convert-filecache-bigint --no-interaction

# database

occ db:add-missing-indices



# mimetype migration

occ maintenance:repair --include-expensive



# Set background jobs to use system cron

occ background:cron