V2 postgresql

conf/config.json

@@ -14,6 +14,7 @@
     "hashing_default_password": true,
     "localstorage.allowsymlinks": true,
     "simpleSignUpLink.shown": false,
+    "default_phone_region": "",
     "mail_smtpmode": "smtp",
     "mail_smtpport": "25",
     "mail_smtpauth": 1,

conf/nginx.conf

@@ -65,7 +65,7 @@ location ^~ __PATH__/ {
   # that file is correctly served; if it doesn't, then the request is passed to
   # the front-end controller. This consistent behaviour means that we don't need
   # to specify custom rules for certain paths (e.g. images and other assets,
-  # `/updater`, `/ocm-provider`, `/ocs-provider`), and thus
+  # `/updater`, `/ocs-provider`), and thus
   # `try_files $uri $uri/ /nextcloud/index.php$request_uri`
   # always provides the desired behaviour.
   index index.php index.html __PATH__/index.php$request_uri;

manifest.toml

@@ -5,7 +5,7 @@ name = "Nextcloud"
 description.en = "Online storage, file sharing platform and various other applications"
 description.fr = "Stockage en ligne, plateforme de partage de fichiers et diverses autres applications"
 
-version = "28.0.1~ynh1"
+version = "28.0.1~ynh2"
 
 maintainers = ["kay0u"]
 
@@ -73,8 +73,8 @@ ram.runtime = "512M"
     api.allowed = ["visitors", "all_users"]
 
     [resources.apt]
-    packages = "mariadb-server, imagemagick, libmagickcore-6.q16-6-extra, acl, tar, smbclient, at, php8.2-fpm, php8.2-bz2, php8.2-imap, php8.2-gmp, php8.2-gd, php8.2-intl, php8.2-curl, php8.2-apcu, php8.2-redis, php8.2-ldap, php8.2-imagick, php8.2-zip, php8.2-mbstring, php8.2-xml, php8.2-mysql, php8.2-igbinary, php8.2-bcmath"
+    packages = "postgresql, imagemagick, libmagickcore-6.q16-6-extra, acl, tar, smbclient, at, php8.2-pgsql, php8.2-fpm, php8.2-bz2, php8.2-imap, php8.2-gmp, php8.2-gd, php8.2-intl, php8.2-curl, php8.2-apcu, php8.2-redis, php8.2-ldap, php8.2-imagick, php8.2-zip, php8.2-mbstring, php8.2-xml, php8.2-igbinary, php8.2-bcmath"
 
     [resources.database]
-    type = "mysql"
-
+    type = "postgresql"
+

scripts/backup

@@ -8,7 +8,6 @@
 
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
-source ../settings/scripts/_ynh_mysql_dump_db.sh
 
 #=================================================
 # DECLARE DATA AND CONF FILES TO BACKUP
@@ -61,11 +60,11 @@ ynh_backup --src_path="/etc/fail2ban/filter.d/$app.conf"
 ynh_backup --src_path="/etc/cron.d/$app"
 
 #=================================================
-# BACKUP THE MYSQL DATABASE
+# BACKUP THE POSTGRESQL DATABASE
 #=================================================
-ynh_print_info --message="Backing up the MySQL database..."
+ynh_print_info --message="Backing up the PostgreSQL database..."
 
-ynh_mysql_dump_db --database="$db_name" --default_character_set="utf8mb4" > db.sql
+ynh_psql_dump_db --database="$db_name" > db.sql
 
 #=================================================
 # END OF SCRIPT

scripts/install

@@ -2,20 +2,11 @@
 
 source _common.sh
 source /usr/share/yunohost/helpers
-source _ynh_mysql_connect_as.sh
 
 phpflags="--define apc.enable_cli=1"
 
 ynh_app_setting_set --app=$app --key=phpflags --value=$phpflags
 
-#=================================================
-# CREATE A MYSQL DATABASE
-#=================================================
-ynh_script_progression --message="Migrate MySQL database to utf8..." --weight=2
-
-ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name \
-    <<< "ALTER DATABASE $db_name CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;"
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -85,7 +76,7 @@ admin_password="$(ynh_string_random --length=6)"
 
 # Install Nextcloud using a temporary admin user
 exec_occ maintenance:install \
-    --database "mysql" --database-name $db_name \
+    --database "pgsql" --database-name $db_name \
     --database-user $db_user --database-pass "$db_pwd" \
     --admin-user "admin" --admin-pass "$admin_password" \
     --data-dir "$data_dir/data" \
@@ -96,9 +87,6 @@ exec_occ maintenance:install \
 #=================================================
 ynh_script_progression --message="Configuring $app..." --weight=8
 
-# Set the mysql.utf8mb4 config to true in config.php
-exec_occ config:system:set mysql.utf8mb4 --type boolean --value="true"
-
 # Ensure that UpdateNotification app is disabled
 exec_occ app:disable updatenotification
 
@@ -108,7 +96,7 @@ exec_occ ldap:create-empty-config
 
 # Load the installation config file in Nextcloud
 nc_conf="$install_dir/config_install.json"
-ynh_add_config --template="../conf/config_install.json" --destination="$nc_conf"
+ynh_add_config --template="config_install.json" --destination="$nc_conf"
 
 exec_occ config:import "$nc_conf"
 
@@ -117,7 +105,7 @@ ynh_secure_remove --file="$nc_conf"
 
 # Load the additional config file (used also for upgrade)
 nc_conf="$install_dir/config.json"
-ynh_add_config --template="../conf/config.json" --destination="$nc_conf"
+ynh_add_config --template="config.json" --destination="$nc_conf"
 
 exec_occ config:import "$nc_conf"
 
@@ -184,8 +172,9 @@ exec_occ config:system:set overwrite.cli.url --value="https://${domain}${path}"
 #=================================================
 
 # Set the user as admin
-ynh_mysql_connect_as --user=$db_name --password="$db_pwd" --database=$db_name --default_character_set="utf8mb4" \
+ynh_psql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name \
     <<< "INSERT INTO oc_group_user VALUES ('admin','$admin');"
+
 # And delete admin user
 exec_occ user:delete admin
 
@@ -201,7 +190,7 @@ ynh_store_file_checksum --file="$install_dir/config/config.php"
 #=================================================
 
 cron_path="/etc/cron.d/$app"
-ynh_add_config --template="../conf/nextcloud.cron" --destination="$cron_path"
+ynh_add_config --template="nextcloud.cron" --destination="$cron_path"
 chown root: "$cron_path"
 chmod 644 "$cron_path"
 
@@ -222,10 +211,12 @@ ynh_script_progression --message="Adding multimedia directories..." --weight=6
 
 # Build YunoHost multimedia directories
 ynh_multimedia_build_main_dir
+
 # Mount the user directory in Nextcloud
 exec_occ app:enable files_external
 create_external_storage "/home/yunohost.multimedia/\$user" "Multimedia"
 create_external_storage "/home/yunohost.multimedia/share" "Shared multimedia"
+
 # Allow nextcloud to write into these directories
 ynh_multimedia_addaccess $app
 

scripts/restore

@@ -2,7 +2,6 @@
 
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
-source ../settings/scripts/_ynh_mysql_connect_as.sh
 
 #=================================================
 # STANDARD RESTORATION STEPS
@@ -14,21 +13,21 @@ ynh_script_progression --message="Restoring the app main directory..."
 ynh_restore_file --origin_path="$install_dir"
 
 #=================================================
-# RESTORE THE MYSQL DATABASE
+# RESTORE THE POSTGRESQL DATABASE
 #=================================================
-ynh_script_progression --message="Restoring the MySQL database..." --weight=9
+ynh_script_progression --message="Restoring the PostgreSQL database..." --weight=9
 
-ynh_mysql_connect_as --user=$db_name --password=$db_pwd --database=$db_name --default_character_set="utf8mb4" < ./db.sql
+ynh_psql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < ./db.sql
 
 #=================================================
 # RESTORE THE PHP-FPM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=50
+ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=5
 
 # Restore the file first, so it can have a backup if different
 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
-# Recreate a dedicated php-fpm config
+# Recreate a dedicated PHP-FPM config
 ynh_add_fpm_config
 
 #=================================================

scripts/upgrade

@@ -62,6 +62,34 @@ exec_occ() {
     php$NEXTCLOUD_PHP_VERSION --define apc.enable_cli=1 occ --no-interaction --no-ansi "$@")
 }
 
+#=================================================
+# HANDLE DATABASE MIGRATION FROM MYSL TO PSQL
+#=================================================
+
+mysql_db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
+
+if [ -n "$mysql_db_pwd" ]
+then
+    ynh_script_progression --message="Migrating to PostgreSQL database..." --weight=3
+
+    #ynh_backup_if_checksum_is_different --file="$install_dir/config/config.php"
+
+    ynh_psql_test_if_first_run
+    ynh_psql_setup_db --db_user=$db_user --db_name=$db_name #--db_pwd=$(ynh_string_random)
+    #ynh_app_setting_set --app=$app --key=psqlpwd --value=$db_pwd
+
+    exec_occ db:convert-type --all-apps --clear-schema pgsql $db_name 127.0.0.1 $db_name --password=$db_pwd -n
+
+    ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name
+    ynh_app_setting_delete --app=$app --key=mysqlpwd
+
+    #ynh_store_file_checksum --file="${install_dir}/config/config.php"
+fi
+
+#=================================================
+# DOWNLOAD, CHECK AND UNPACK SOURCE
+#=================================================
+
 # Define a function to add an external storage
 # Create the external storage for the given folders and enable sharing
 create_external_storage() {
@@ -90,15 +118,6 @@ then
     # Print the current version number of Nextcloud
     exec_occ -V
 
-    if [ "$(exec_occ config:system:get mysql.utf8mb4)" != "true" ]; then
-        db_pwd=$(ynh_app_setting_get --app=$app --key=db_pwd)
-        # Change your databases character set and collation
-        ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name \
-        <<< "ALTER DATABASE $db_name CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;"
-        # Set the mysql.utf8mb4 config to true in config.php
-        exec_occ config:system:set mysql.utf8mb4 --type boolean --value="true"
-        exec_occ maintenance:repair
-    fi
 
     # Upgrade may fail if this app is enabled
     # Take all apps enabled, and check if mail is one of them
@@ -202,13 +221,13 @@ EOF
     #=================================================
     # CONFIGURE NEXTCLOUD
     #=================================================
-    ynh_script_progression --message="Reconfiguring Nextcloud..." --weight=9
+    ynh_script_progression --message="Reconfiguring $app..." --weight=9
 
     # Verify the checksum and backup the file if it's different
     ynh_backup_if_checksum_is_different --file="$install_dir/config/config.php"
 
     nc_conf="${install_dir}/config.json"
-    ynh_add_config --template="../conf/config.json" --destination="$nc_conf"
+    ynh_add_config --template="config.json" --destination="$nc_conf"
 
     # Reneable the mail app
     if [ $mail_app_must_be_reactived -eq 1 ]; then
@@ -275,7 +294,7 @@ EOF
 fi
 
 #=================================================
-# REGEN SYSTEM CONFIGURATIONS
+# REGEN PERMISSIONS
 #=================================================
 ynh_script_progression --message="Reapplying file permissions..." --weight=2
 
@@ -295,15 +314,15 @@ chmod 750 $install_dir
 #=================================================
 ynh_script_progression --message="Regenerating system configurations for $app..." --weight=2
 
-# -------
+#-------------------------------------------------
 # PHP-FPM
-# -------
+#-------------------------------------------------
 
 ynh_add_fpm_config
 
-# -------
+#-------------------------------------------------
 # NGINX
-# -------
+#-------------------------------------------------
 
 # Delete current NGINX configuration to be able to check if .well-known is already served.
 ynh_backup_if_checksum_is_different --file="/etc/nginx/conf.d/$domain.d/$app.conf"
@@ -325,27 +344,29 @@ fi
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
-# -------
+#-------------------------------------------------
 # CRON JOB
-# -------
+#-------------------------------------------------
+
 cron_path="/etc/cron.d/$app"
 ynh_add_config --template="../conf/nextcloud.cron" --destination="$cron_path"
 chown root: "$cron_path"
 chmod 644 "$cron_path"
 
 exec_occ background:cron
 
-# -------
+#-------------------------------------------------
 # LOGROTATE
-# -------
+#-------------------------------------------------
+
 ynh_use_logrotate --non-append
 
-# -------
+#-------------------------------------------------
 # FAIL2BAN
-# -------
+#-------------------------------------------------
 
 # Create a dedicated Fail2Ban config
-ynh_add_fail2ban_config --logpath="/home/yunohost.app/$app/data/nextcloud.log" --failregex="^.*Login failed: '.*' \(Remote IP: '<HOST>'.*$" --max_retry=5
+ynh_add_fail2ban_config --logpath="$data_dir/data/nextcloud.log" --failregex="^.*Login failed: '.*' \(Remote IP: '<HOST>'.*$" --max_retry=5
 
 #=================================================
 # END OF SCRIPT