From 5efe8430a01ec036e7d55e5829a8bf7636466709 Mon Sep 17 00:00:00 2001
From: Mar Alegre <mar@mar.alemor.org>
Date: Mon, 28 Jul 2025 00:39:33 -0400
Subject: [PATCH] various fixes for new version of nextcloud

---
 nextcloud/Containerfile      | 10 ++++------
 nextcloud/Systemdfile        |  4 ++--
 nextcloud/assets/bin/db-make |  2 +-
 nextcloud/assets/php/php.ini |  4 ++--
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/nextcloud/Containerfile b/nextcloud/Containerfile
index 3edf80a..81501c9 100644
--- a/nextcloud/Containerfile
+++ b/nextcloud/Containerfile
@@ -27,7 +27,6 @@ RUN apt update -y && apt install -y apache2 php-fpm php-gd php-zip php-pgsql \
     php-curl php-mbstring php-intl php-imagick php-xml php-gmp php-json \
     redis php-redis postgresql postgresql-doc php-ldap php-bcmath cron
 
-
 # put database variables in /etc/environment so anyone can access them
 # also autodetect versions of php and postgres and put them in /etc/environment as well
 RUN echo "DBUSER=$DBUSER" >> /etc/environment && \
@@ -66,13 +65,12 @@ RUN mv php/php.ini /etc/php/${PHPV:?}/fpm/ && \
 ###
 
 # configure PostgreSQL
-COPY --chown=postgres:postgres assets/postgresql ./
+COPY --chown=postgres:postgres assets/postgresql postgresql/
 # If the posgresql.conf file contains multiple entries for the same parameter, all but the last one is ignored.
 # So we can just append our settings to the already-existing postgresql.conf file.
-RUN mv postgresql/pg_hba.conf /etc/postgresql/${PSQLV:?}/main/ & \
-    cat postgresql/postgresql.conf >> /etc/postgresql/${PSQLV:?}/main/postgresql.conf
-
-
+RUN mv postgresql/pg_hba.conf /etc/postgresql/${PSQLV:?}/main/ && \
+    cat postgresql/postgresql.conf >> /etc/postgresql/${PSQLV:?}/main/postgresql.conf && \
+    rm -r postgresql
 
 ###
 ### Apache
diff --git a/nextcloud/Systemdfile b/nextcloud/Systemdfile
index 70104c6..5544c02 100644
--- a/nextcloud/Systemdfile
+++ b/nextcloud/Systemdfile
@@ -23,10 +23,10 @@ nc-occ app:install calendar
 nc-occ app:install contacts
 nc-occ app:install notes
 nc-occ app:install bookmarks
-nc-occ app:install mail
+#nc-occ app:install mail
 
 # disable apps we don't want
-nc-occ app:disable comments dashboard federation files_trashbin firstrunwizard recommendations support survey_client systemtags
+nc-occ app:disable comments dashboard federation files_trashbin firstrunwizard recommendations support survey_client systemtags weather_status
 
 # configure apps
 # set calendar to refresh subscriptions once a day (to set to one hour use 'PT1H' instead)
diff --git a/nextcloud/assets/bin/db-make b/nextcloud/assets/bin/db-make
index 7a230d6..21d4c08 100755
--- a/nextcloud/assets/bin/db-make
+++ b/nextcloud/assets/bin/db-make
@@ -9,4 +9,4 @@ cmd "DROP DATABASE IF EXISTS ${DBNAME:?};"
 cmd "DROP USER IF EXISTS ${DBUSER:?};"
 cmd "CREATE USER ${DBUSER:?};"
 cmd "CREATE DATABASE ${DBNAME:?};"
-cmd "GRANT ALL PRIVILEGES ON DATABASE ${DBNAME:?} TO ${DBUSER:?};"
+cmd "ALTER DATABASE ${DBNAME:?} OWNER TO ${DBUSER:?};"
diff --git a/nextcloud/assets/php/php.ini b/nextcloud/assets/php/php.ini
index 769c05a..54a9e55 100644
--- a/nextcloud/assets/php/php.ini
+++ b/nextcloud/assets/php/php.ini
@@ -1785,10 +1785,10 @@ opcache.enable=1
 ;opcache.enable_cli=0
 
 ; The OPcache shared memory storage size.
-opcache.memory_consumption=128
+opcache.memory_consumption=256
 
 ; The amount of memory for interned strings in Mbytes.
-opcache.interned_strings_buffer=8
+opcache.interned_strings_buffer=16
 
 ; The maximum number of keys (scripts) in the OPcache hash table.
 ; Only numbers between 200 and 1000000 are allowed.