|
|
@@ -31,6 +31,29 @@ ynh_script_progression --message="Checking version..."
|
|
|
upgrade_type=$(ynh_check_app_version_changed)
|
|
|
|
|
|
#=================================================
|
|
|
+# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
|
|
|
+#=================================================
|
|
|
+ynh_script_progression --message="Backing up the app before upgrading (may take a while)..."
|
|
|
+
|
|
|
+# Backup the current version of the app
|
|
|
+ynh_backup_before_upgrade
|
|
|
+ynh_clean_setup () {
|
|
|
+ # Restore it if the upgrade fails
|
|
|
+ ynh_restore_upgradebackup
|
|
|
+}
|
|
|
+# Exit if an error occurs during the execution of the script
|
|
|
+ynh_abort_if_errors
|
|
|
+
|
|
|
+#=================================================
|
|
|
+# STANDARD UPGRADE STEPS
|
|
|
+#=================================================
|
|
|
+# STOP SYSTEMD SERVICE
|
|
|
+#=================================================
|
|
|
+ynh_script_progression --message="Stopping a systemd service..."
|
|
|
+
|
|
|
+ynh_systemd_action --service_name=$service_name --action="stop" --log_path=systemd #--line_match="Started YunoHost Wifi Hotspot"
|
|
|
+
|
|
|
+#=================================================
|
|
|
# ENSURE DOWNWARD COMPATIBILITY
|
|
|
#=================================================
|
|
|
ynh_script_progression --message="Ensuring downward compatibility..."
|
|
|
@@ -67,27 +90,12 @@ if [ -z $service_name ]; then
|
|
|
fi
|
|
|
|
|
|
#=================================================
|
|
|
-# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
|
|
|
-#=================================================
|
|
|
-ynh_script_progression --message="Backing up the app before upgrading (may take a while)..."
|
|
|
-
|
|
|
-# Backup the current version of the app
|
|
|
-ynh_backup_before_upgrade
|
|
|
-ynh_clean_setup () {
|
|
|
- # restore it if the upgrade fails
|
|
|
- ynh_restore_upgradebackup
|
|
|
-}
|
|
|
-# Exit if an error occurs during the execution of the script
|
|
|
-ynh_abort_if_errors
|
|
|
-
|
|
|
-#=================================================
|
|
|
-# STANDARD UPGRADE STEPS
|
|
|
-#=================================================
|
|
|
-# STOP SYSTEMD SERVICE
|
|
|
+# CREATE DEDICATED USER
|
|
|
#=================================================
|
|
|
-ynh_script_progression --message="Stopping a systemd service..."
|
|
|
+ynh_script_progression --message="Making sure dedicated system user exists..."
|
|
|
|
|
|
-ynh_systemd_action --service_name=$service_name --action="stop" --log_path=systemd #--line_match="Started YunoHost Wifi Hotspot"
|
|
|
+# Create a dedicated user (if not existing)
|
|
|
+ynh_system_user_create --username=$app --home_dir=$final_path
|
|
|
|
|
|
#=================================================
|
|
|
# DOWNLOAD, CHECK AND UNPACK SOURCE
|
|
|
@@ -101,12 +109,18 @@ then
|
|
|
cp -a ../sources/* ${final_path}/
|
|
|
fi
|
|
|
|
|
|
+# Restore permissions on app files
|
|
|
+chmod -R 0644 ${final_path}/*
|
|
|
+chmod 750 "$final_path"
|
|
|
+chmod -R o-rwx "$final_path"
|
|
|
+chown -R $app:www-data "$final_path"
|
|
|
+
|
|
|
#=================================================
|
|
|
# NGINX CONFIGURATION
|
|
|
#=================================================
|
|
|
-ynh_script_progression --message="Upgrading nginx web server configuration..."
|
|
|
+ynh_script_progression --message="Upgrading NGINX web server configuration..."
|
|
|
|
|
|
-# Create a dedicated nginx config
|
|
|
+# Create a dedicated NGINX config
|
|
|
ynh_add_nginx_config
|
|
|
|
|
|
#=================================================
|
|
|
@@ -115,28 +129,20 @@ ynh_add_nginx_config
|
|
|
ynh_script_progression --message="Upgrading dependencies..."
|
|
|
|
|
|
if [[ $firmware_nonfree -eq 1 ]]; then
|
|
|
- check_armbian_nonfree_conflict
|
|
|
- ynh_install_extra_app_dependencies --repo="deb http://deb.debian.org/debian $(ynh_get_debian_release) non-free" --package="$nonfree_firmware_packages"
|
|
|
+ check_armbian_nonfree_conflict
|
|
|
+ ynh_install_extra_app_dependencies --repo="deb http://deb.debian.org/debian $(ynh_get_debian_release) non-free" --package="$nonfree_firmware_packages"
|
|
|
else
|
|
|
- pkg_dependencies="$pkg_dependencies $free_firmware_packages"
|
|
|
+ pkg_dependencies="$pkg_dependencies $free_firmware_packages"
|
|
|
fi
|
|
|
|
|
|
-ynh_install_app_dependencies "$pkg_dependencies"
|
|
|
-
|
|
|
-#=================================================
|
|
|
-# CREATE DEDICATED USER
|
|
|
-#=================================================
|
|
|
-ynh_script_progression --message="Making sure dedicated system user exists..."
|
|
|
-
|
|
|
-# Create a dedicated user (if not existing)
|
|
|
-ynh_system_user_create --username=$app
|
|
|
+ynh_install_app_dependencies $pkg_dependencies
|
|
|
|
|
|
#=================================================
|
|
|
# PHP-FPM CONFIGURATION
|
|
|
#=================================================
|
|
|
-ynh_script_progression --message="Upgrading php-fpm configuration..."
|
|
|
+ynh_script_progression --message="Upgrading PHP-FPM configuration..."
|
|
|
|
|
|
-# Create a dedicated php-fpm config
|
|
|
+# Create a dedicated PHP-FPM config
|
|
|
ynh_add_fpm_config
|
|
|
|
|
|
#=================================================
|
|
|
@@ -158,11 +164,13 @@ install -o root -g root -m 0755 ../conf/$service_name /usr/local/bin/
|
|
|
ynh_replace_string --match_string="__PHPVERSION__" --replace_string="${phpversion}" --target_file="/usr/local/bin/$service_name"
|
|
|
|
|
|
#=================================================
|
|
|
-# MODIFY A CONFIG FILE
|
|
|
+# UPDATE A CONFIG FILE
|
|
|
#=================================================
|
|
|
-ynh_script_progression --message="Modifying a config file..."
|
|
|
+ynh_script_progression --message="Updating a configuration file..."
|
|
|
|
|
|
ynh_add_config --template="config.php.tpl" --destination="$final_path/config.php"
|
|
|
+
|
|
|
+chmod 400 "$final_path/config.php"
|
|
|
chown $app:$app "$final_path/config.php"
|
|
|
|
|
|
#=================================================
|
|
|
@@ -176,17 +184,6 @@ ynh_add_systemd_config --service=$service_name
|
|
|
#=================================================
|
|
|
# GENERIC FINALIZATION
|
|
|
#=================================================
|
|
|
-# SECURE FILES AND DIRECTORIES
|
|
|
-#=================================================
|
|
|
-ynh_script_progression --message="Securing files and directories..."
|
|
|
-
|
|
|
-# Set permissions on app files
|
|
|
-chown -R $app:$app ${final_path}/
|
|
|
-chmod -R 0644 ${final_path}/*
|
|
|
-find ${final_path}/ -type d -exec chmod +x {} \;
|
|
|
-chmod o-rwx "${final_path}"
|
|
|
-
|
|
|
-#=================================================
|
|
|
# INTEGRATE SERVICE IN YUNOHOST
|
|
|
#=================================================
|
|
|
ynh_script_progression --message="Integrating service in YunoHost..."
|
|
|
@@ -202,23 +199,23 @@ hot_reload_usb_wifi_cards
|
|
|
wifi_device=$(bash ../conf/iw_devices | awk -F\| '{ print $1 }')
|
|
|
|
|
|
if [[ -z $wifi_device ]]; then
|
|
|
- ynh_app_setting_set --app=$app --key=service_enabled --value=0
|
|
|
- wifi_device=none
|
|
|
+ ynh_app_setting_set --app=$app --key=service_enabled --value=0
|
|
|
+ wifi_device=none
|
|
|
else
|
|
|
- ynh_app_setting_set --app=$app --key=service_enabled --value=1
|
|
|
+ ynh_app_setting_set --app=$app --key=service_enabled --value=1
|
|
|
fi
|
|
|
|
|
|
# Start a systemd service if device is present
|
|
|
if [[ $wifi_device == none ]]; then
|
|
|
- echo "WARNING: Wifi Hotspot is not started because no wifi device was found (please, check the web admin)" >&2
|
|
|
+ echo "WARNING: Wifi Hotspot is not started because no wifi device was found (please, check the web admin)" >&2
|
|
|
else
|
|
|
- ynh_systemd_action --service_name=$service_name --action="start" --log_path=systemd #--line_match="Started YunoHost Wifi Hotspot"
|
|
|
+ ynh_systemd_action --service_name=$service_name --action="start" --log_path=systemd #--line_match="Started YunoHost Wifi Hotspot"
|
|
|
fi
|
|
|
|
|
|
#=================================================
|
|
|
# RELOAD NGINX
|
|
|
#=================================================
|
|
|
-ynh_script_progression --message="Reloading nginx web server..."
|
|
|
+ynh_script_progression --message="Reloading NGINX web server..."
|
|
|
|
|
|
ynh_systemd_action --service_name=nginx --action=reload
|
|
|
|
