@ -38,22 +38,21 @@ if [ -z $final_path ]; then
ynh_app_setting_set $app final_path $final_path ynh_app_setting_set $app final_path $final_path
fifi
# Remove the option backup_core_only if it's in the settings.yml file
ynh_app_setting_delete $app backup_core_only
#=================================================#=================================================
# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
#=================================================#=================================================
# Made a backup only after the version 11.0.0# Made a backup only after the version 11.0.0
# Before, the datas will be always saved.# Before, the datas will be always saved.
# Get the current version number of nextcloud/owncloud# Get the current version number of nextcloud/owncloud
current_version=$(grep OC_VersionString "$final_path/version.php" | cut -d\' -f2)current_version=$(grep OC_VersionString "$final_path/version.php" | cut -d\' -f2)
current_major_version=${current_version%%.*}current_major_version=${current_version%%.*}
if [ $current_major_version -gt 11 ]if [ $current_major_version -gt 11 ]
thenthen
# Inform the backup/restore process that it should not save the data directory
ynh_app_setting_set $app backup_core_only 1
# Backup the current version of the app # Backup the current version of the app
ynh_backup_before_upgrade ynh_backup_before_upgrade
ynh_clean_setup () { ynh_clean_setup () {
@ -65,7 +64,7 @@ then
} }
fifi
# Exit if an error occurs during the script execution
# Exit if an error occurs during the execution of the script
ynh_abort_if_errorsynh_abort_if_errors
#=================================================#=================================================
@ -75,7 +74,7 @@ ynh_abort_if_errors
ynh_handle_app_migration "owncloud" "owncloud_migration"ynh_handle_app_migration "owncloud" "owncloud_migration"
if [ $migration_process -eq 1 ]if [ $migration_process -eq 1 ]
thenthen
# If a migration has been perform
# If a migration has been performed
# Reload some values changed by the migration process # Reload some values changed by the migration process
final_path=$(ynh_app_setting_get $app final_path) final_path=$(ynh_app_setting_get $app final_path)
db_name=$(ynh_app_setting_get $app db_name) db_name=$(ynh_app_setting_get $app db_name)
@ -106,20 +105,18 @@ path_url=$(ynh_normalize_url_path $path_url)
# NGINX CONFIGURATION# NGINX CONFIGURATION
#=================================================#=================================================
ynh_backup_if_checksum_is_different "/etc/nginx/conf.d/$domain.d/$app.conf"
# Delete current nginx configuration to be able to check if .well-known is already served.# Delete current nginx configuration to be able to check if .well-known is already served.
ynh_remove_nginx_configynh_remove_nginx_config
ynh_app_setting_delete $app "checksum__etc_nginx_conf.d_$domain.d_$app.conf" || trueynh_app_setting_delete $app "checksum__etc_nginx_conf.d_$domain.d_$app.conf" || true
# Do not serve .well-known if it's already served on the domain# Do not serve .well-known if it's already served on the domain
if is_url_handled "https://${ domain} /.well-known/caldav" ; then
if is_url_handled "https://$domain/.well-known/caldav" ; then
sed -ri '/^location = \/\.well\-known\/(caldav|carddav) \{/,/\}/d' \ sed -ri '/^location = \/\.well\-known\/(caldav|carddav) \{/,/\}/d' \
"../conf/nginx.conf" "../conf/nginx.conf"
fifi
# Handle root path, avoid double slash.
# Temporary fix, in waiting for an upgrade of the helper. (#361)
path_url_slash_less=${path_url%/}
ynh_replace_string "__PATH__/" "$path_url_slash_less/" "../conf/nginx.conf"
# Create a dedicated nginx config# Create a dedicated nginx config
ynh_add_nginx_configynh_add_nginx_config
@ -127,7 +124,7 @@ ynh_add_nginx_config
# CREATE DEDICATED USER# CREATE DEDICATED USER
#=================================================#=================================================
# Create a system user
# Create a dedicated user (if not existing)
ynh_system_user_create $appynh_system_user_create $app
#=================================================#=================================================
@ -149,13 +146,20 @@ ynh_install_app_dependencies $pkg_dependencies
# MAKE SEQUENTIAL UPGRADES FROM EACH MAJOR# MAKE SEQUENTIAL UPGRADES FROM EACH MAJOR
# VERSION TO THE NEXT ONE# VERSION TO THE NEXT ONE
#=================================================#=================================================
ynh_print_info "Upgrading nextcloud..."
# Define a function to execute commands with `occ`
exec_occ() {
(cd "$final_path" && exec_as "$app" \
php occ --no-interaction --no-ansi "$@")
}
# Load the last available version# Load the last available version
source upgrade.d/upgrade.last.shsource upgrade.d/upgrade.last.sh
last_version=$next_versionlast_version=$next_version
# Define app's data directory# Define app's data directory
datadir="/home/yunohost.app/${app}/data"
datadir="/home/yunohost.app/$app/data"
# Set write access for the following commands# Set write access for the following commands
chown -R $app: "$final_path" "$datadir"chown -R $app: "$final_path" "$datadir"
@ -183,7 +187,7 @@ do
# Load the value for this version # Load the value for this version
source upgrade.d/upgrade.$current_major_version.sh source upgrade.d/upgrade.$current_major_version.sh
echo -e "\nUpgrade to nextcloud $next_version" >&2
ynh_print_info "Upgrade to nextcloud $next_version"
# Create an app.src for this version of nextcloud # Create an app.src for this version of nextcloud
cp ../conf/app.src.default ../conf/app.src cp ../conf/app.src.default ../conf/app.src
@ -217,7 +221,7 @@ do
# Upgrade Nextcloud (SUCCESS = 0, UP_TO_DATE = 3) # Upgrade Nextcloud (SUCCESS = 0, UP_TO_DATE = 3)
exec_occ maintenance:mode --off exec_occ maintenance:mode --off
exec_occ upgrade \ exec_occ upgrade \
|| ([[ $? -eq 3 ] ] || ynh_die "Unable to upgrade Nextcloud")
|| ([ $? -eq 3 ] || ynh_die "Unable to upgrade Nextcloud")
# Get the new current version number # Get the new current version number
current_version=$(grep OC_VersionString "$final_path/version.php" | cut -d\' -f2) current_version=$(grep OC_VersionString "$final_path/version.php" | cut -d\' -f2)
@ -232,12 +236,13 @@ done
#=================================================#=================================================
# Verify the checksum and backup the file if it's different# Verify the checksum and backup the file if it's different
ynh_backup_if_checksum_is_different "${ final_path} /config/config.php"
ynh_backup_if_checksum_is_different "$final_path/config/config.php"
nc_conf="${final_path}/config.json"nc_conf="${final_path}/config.json"
cp ../conf/config.json "$nc_conf"cp ../conf/config.json "$nc_conf"
ynh_replace_string "#DOMAIN#" "$domain" "$nc_conf"
ynh_replace_string "#DATADIR#" "$datadir" "$nc_conf"
ynh_replace_string "__DOMAIN__" "$domain" "$nc_conf"
ynh_replace_string "__DATADIR__" "$datadir" "$nc_conf"
# Ensure that UpdateNotification app is disabled# Ensure that UpdateNotification app is disabled
exec_occ app:disable updatenotificationexec_occ app:disable updatenotification
@ -247,7 +252,8 @@ exec_occ app:enable user_ldap
# Load the config file in nextcloud# Load the config file in nextcloud
exec_occ config:import "$nc_conf"exec_occ config:import "$nc_conf"
# Then remove it
# Then remove the config file
rm -f "$nc_conf"rm -f "$nc_conf"
#=================================================#=================================================
@ -262,12 +268,24 @@ exec_occ config:system:get logout_url >/dev/null 2>&1 \
\$main_domain = exec('cat /etc/yunohost/current_host');\$main_domain = exec('cat /etc/yunohost/current_host');
\$CONFIG['logout_url'] = 'https://'.\$main_domain.'/yunohost/sso/?action=logout';\$CONFIG['logout_url'] = 'https://'.\$main_domain.'/yunohost/sso/?action=logout';
//-YunoHost-//-YunoHost-
" >> "${ final_path} /config/config.php"
" >> "$final_path/config/config.php"
#=================================================#=================================================
# MOUNT HOME FOLDERS AS EXTERNAL STORAGE# MOUNT HOME FOLDERS AS EXTERNAL STORAGE
#=================================================#=================================================
# Define a function to add an external storage
# Create the external storage for the given folders and enable sharing
create_external_storage() {
local datadir="$1"
local mount_name="$2"
local mount_id=`exec_occ files_external:create --output=json \
"$mount_name" 'local' 'null::null' -c "datadir=$datadir" || true`
! [[ $mount_id =~ ^[0-9]+$ ]] \
&& echo "Unable to create external storage" >&2 \
|| exec_occ files_external:option "$mount_id" enable_sharing true
}
# Enable External Storage and create local mount to home folder as needed# Enable External Storage and create local mount to home folder as needed
if [ $user_home -eq 1 ]; thenif [ $user_home -eq 1 ]; then
exec_occ app:enable files_external exec_occ app:enable files_external
@ -276,7 +294,7 @@ if [ $user_home -eq 1 ]; then
|| create_external_storage "/home/\$user" "Home" || create_external_storage "/home/\$user" "Home"
# Iterate over users to extend their home folder permissions # Iterate over users to extend their home folder permissions
for u in $(ynh_user_list); do for u in $(ynh_user_list); do
setfacl -m g:$app:rwx "/home/$u" || true
setfacl -- modify g:$app:rwx "/home/$u" || true
done done
fifi
@ -296,8 +314,8 @@ cp -a ../conf/nextcloud.cron "$cron_path"
chown root: "$cron_path"chown root: "$cron_path"
chmod 644 "$cron_path"chmod 644 "$cron_path"
ynh_replace_string "#USER# " "$app" "$cron_path"
ynh_replace_string "#DESTDIR# " "$final_path" "$cron_path"
ynh_replace_string "__USER__ " "$app" "$cron_path"
ynh_replace_string "__DESTDIR__ " "$final_path" "$cron_path"
exec_occ background:cronexec_occ background:cron
@ -306,7 +324,7 @@ exec_occ background:cron
#=================================================#=================================================
# Set system group in hooks# Set system group in hooks
ynh_replace_string "#GROUP# " "$app" ../hooks/post_user_create
ynh_replace_string "__GROUP__ " "$app" ../hooks/post_user_create
#=================================================#=================================================
# YUNOHOST MULTIMEDIA INTEGRATION# YUNOHOST MULTIMEDIA INTEGRATION
@ -329,11 +347,11 @@ ynh_multimedia_addaccess $app
# Fix app ownerships & permissions# Fix app ownerships & permissions
chown -R $app: "$final_path" "$datadir"chown -R $app: "$final_path" "$datadir"
find ${ final_path} / -type f -print0 | xargs -0 chmod 0644
find ${ final_path} / -type d -print0 | xargs -0 chmod 0755
find ${ datadir} / -type f -print0 | xargs -0 chmod 0640
find ${ datadir} / -type d -print0 | xargs -0 chmod 0750
chmod 640 "${ final_path} /config/config.php"
find $final_path/ -type f -print0 | xargs -0 chmod 0644
find $final_path/ -type d -print0 | xargs -0 chmod 0755
find $datadir/ -type f -print0 | xargs -0 chmod 0640
find $datadir/ -type d -print0 | xargs -0 chmod 0750
chmod 640 "$final_path/config/config.php"
chmod 755 /home/yunohost.appchmod 755 /home/yunohost.app
#=================================================#=================================================
@ -341,8 +359,8 @@ chmod 755 /home/yunohost.app
#=================================================#=================================================
# Warn about possible disabled apps# Warn about possible disabled apps
echo "Note that if you've installed some third-parties Nextcloud applications, \
they are probably disabled and you'll have to manually enable them again." >&2
ynh_print_warn "Note that if you've installed some third-parties Nextcloud applications, \
they are probably disabled and you'll have to manually enable them again."
#=================================================#=================================================
# SETUP LOGROTATE# SETUP LOGROTATE
@ -373,10 +391,10 @@ systemctl reload nginx
if [ $migration_process -eq 1 ]if [ $migration_process -eq 1 ]
thenthen
ech o "ownCloud has been successfully migrated to Nextcloud! \
ynh_print_inf o "ownCloud has been successfully migrated to Nextcloud! \
A last scheduled operation will run in a couple of minutes to finish the \A last scheduled operation will run in a couple of minutes to finish the \
migration in YunoHost side. Do not proceed any application operation while \migration in YunoHost side. Do not proceed any application operation while \
you don't see Nextcloud as installed." >&2
you don't see Nextcloud as installed."
# Execute a post migration script after the end of this upgrade. # Execute a post migration script after the end of this upgrade.
# Mainly for some cleaning # Mainly for some cleaning
Maniack Crudelis
7 years ago