diff --git a/README.md b/README.md index 33ff707..a3a3f58 100644 --- a/README.md +++ b/README.md @@ -23,8 +23,8 @@ Syncthing replaces proprietary sync and cloud services with something open, trus #### Supported architectures -* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/syncthing%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/syncthing/) -* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/syncthing%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/syncthing/) +* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/syncthing.svg)](https://ci-apps.yunohost.org/ci/apps/syncthing/) +* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/syncthing.svg)](https://ci-apps-arm.yunohost.org/ci/apps/syncthing/) ## Links diff --git a/check_process b/check_process index 9bb6d63..e25ccb5 100644 --- a/check_process +++ b/check_process @@ -1,8 +1,3 @@ -# See here for more information -# https://github.com/YunoHost/package_check#syntax-check_process-file - -# Move this file from check_process.default to check_process when you have filled it. - ;; Test complet ; Manifest domain="domain.tld" (DOMAIN) @@ -40,6 +35,8 @@ upgrade=1 from_commit=ae0a88df0bf4a3d684f95e21245ee1e0de4d54f4 # 1.14.0~ynh2 upgrade=1 from_commit=201eab3c30f6a72de8c704190e66e11baf517a8a + # 1.15.1~ynh1 + upgrade=1 from_commit=f373714a18c855c936c86b389d1ef0cf46da447b backup_restore=1 multi_instance=0 port_already_use=0 @@ -71,4 +68,6 @@ Notification=all ; commit=ae0a88df0bf4a3d684f95e21245ee1e0de4d54f4 name=1.14.0~ynh1 ; commit=201eab3c30f6a72de8c704190e66e11baf517a8a - name=1.14.0~ynh2 \ No newline at end of file + name=1.14.0~ynh2 + ; commit=f373714a18c855c936c86b389d1ef0cf46da447b + name=1.15.1~ynh1 diff --git a/manifest.json b/manifest.json index 6a978ad..40acec7 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Continuous file synchronization program.", "fr": "Programme de synchronisation de fichiers en continu." }, - "version": "1.15.1~ynh1", + "version": "1.15.1~ynh2", "url": "https://syncthing.net/", "license": "MPL-2.0", "maintainer": [ @@ -23,38 +23,26 @@ }, "multi_instance": false, "services": [ - "nginx" + "nginx" ], "arguments": { - "install": [ + "install" : [ { "name": "domain", "type": "domain", - "ask": { - "en": "Choose a domain for Syncthing", - "fr": "Choisissez un nom de domaine pour Syncthing" - }, "example": "example.com" }, { "name": "path", "type": "path", - "ask": { - "en": "Choose a path for Syncthing", - "fr": "Choisissez un chemin pour Syncthing" - }, "example": "/syncthing", "default": "/syncthing" - }, - { - "name": "admin", - "type": "user", - "ask": { - "en": "Choose an admin user", - "fr": "Choisissez l'administrateur" - }, - "example": "johndoe" - } + }, + { + "name": "admin", + "type": "user", + "example": "johndoe" + } ] } } diff --git a/scripts/backup b/scripts/backup index ccef97b..cb832ff 100644 --- a/scripts/backup +++ b/scripts/backup @@ -6,7 +6,7 @@ # IMPORT GENERIC HELPERS #================================================= -#Keep this path for calling _common.sh inside the execution's context of backup and restore scripts +# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers diff --git a/scripts/change_url b/scripts/change_url index 25019c7..caac7fc 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -36,9 +36,9 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) gui_port=$(ynh_app_setting_get --app=$app --key=gui_port) #================================================= -# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP +# BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP #================================================= -ynh_script_progression --message="Backing up the app before changing its url (may take a while)..." +ynh_script_progression --message="Backing up the app before changing its URL (may take a while)..." # Backup the current version of the app ynh_backup_before_upgrade @@ -46,7 +46,7 @@ ynh_clean_setup () { # Remove the new domain config file, the remove script won't do it as it doesn't know yet its location. ynh_secure_remove --file="/etc/nginx/conf.d/$new_domain.d/$app.conf" - # restore it if the upgrade fails + # Restore it if the upgrade fails ynh_restore_upgradebackup } # Exit if an error occurs during the execution of the script @@ -80,23 +80,23 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd #================================================= # MODIFY URL IN NGINX CONF #================================================= -ynh_script_progression --message="Updating nginx web server configuration..." +ynh_script_progression --message="Updating NGINX web server configuration..." nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf -# Change the path in the nginx config file +# Change the path in the NGINX config file if [ $change_path -eq 1 ] then - # Make a backup of the original nginx config file if modified + # Make a backup of the original NGINX config file if modified ynh_backup_if_checksum_is_different --file="$nginx_conf_path" - # Set global variables for nginx helper + # Set global variables for NGINX helper domain="$old_domain" path_url="$new_path" - # Create a dedicated nginx config + # Create a dedicated NGINX config ynh_add_nginx_config "gui_port" fi -# Change the domain for nginx +# Change the domain for NGINX if [ $change_domain -eq 1 ] then # Delete file checksum for the old conf file location @@ -119,7 +119,7 @@ ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --lin #================================================= # 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 diff --git a/scripts/install b/scripts/install index 2eb1e14..7a559d6 100644 --- a/scripts/install +++ b/scripts/install @@ -7,7 +7,7 @@ #================================================= source _common.sh -source detect_arch +source ynh_detect_arch__2 source /usr/share/yunohost/helpers #================================================= @@ -72,6 +72,14 @@ ynh_app_setting_set --app=$app --key=sync_port --value=$sync_port ynh_script_progression --message="Configuring firewall..." ynh_exec_warn_less yunohost firewall allow TCP $sync_port +#================================================= +# CREATE DEDICATED USER +#================================================= +ynh_script_progression --message="Configuring system user..." + +# Create a system user +ynh_system_user_create --username=$app --home_dir="$final_path" + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -81,22 +89,18 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$final_path" --source_id=$architecture +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:$app "$final_path" + #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Configuring nginx web server..." +ynh_script_progression --message="Configuring NGINX web server..." -# Create a dedicated nginx config +# Create a dedicated NGINX config ynh_add_nginx_config "gui_port" -#================================================= -# CREATE DEDICATED USER -#================================================= -ynh_script_progression --message="Configuring system user..." - -# Create a system user -ynh_system_user_create --username=$app --home_dir=$final_path - #================================================= # SPECIFIC SETUP #================================================= @@ -106,7 +110,21 @@ ynh_script_progression --message="Creating sync directory..." # Make directories and set rights mkdir -p "$sync_home" -chown -R "$app": "$sync_home" +chmod 750 "$sync_home" +chmod -R o-rwx "$sync_home" +chown -R $app:$app "$sync_home" + +#================================================= +# ADD A CONFIGURATION +#================================================= +ynh_script_progression --message="Adding a config file..." + +mkdir -p "$final_path/.config/syncthing" +config_file="$final_path/.config/syncthing/config.xml" +ynh_add_config --template="../conf/config.xml" --destination="$config_file" + +chmod 400 "$config_file" +chown $app:$app "$config_file" #================================================= # SETUP SYSTEMD @@ -116,15 +134,6 @@ ynh_script_progression --message="Configuring a systemd service..." # Create a dedicated systemd config ynh_add_systemd_config -#================================================= -# MODIFY A CONFIG FILE -#================================================= -ynh_script_progression --message="Modifying a config file..." - -mkdir -p "$final_path/.config/syncthing" -config_file="$final_path/.config/syncthing/config.xml" -ynh_add_config --template="../conf/config.xml" --destination="$config_file" - #================================================= # FIX LISTENING SERVICE #================================================= @@ -148,20 +157,12 @@ ynh_store_file_checksum --file="$config_file" #================================================= # GENERIC FINALIZATION -#================================================= -# SECURE FILES AND DIRECTORIES -#================================================= -ynh_script_progression --message="Securing files and directories..." - -# Set permissions to app files -chown -R $app: $final_path - #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description "$app daemon for Syncthing" --needs_exposed_ports $sync_port +yunohost service add $app --description="$app daemon for Syncthing" --needs_exposed_ports=$sync_port #================================================= # START SYSTEMD SERVICE @@ -182,7 +183,7 @@ ynh_permission_update --permission="main" --add="visitors" #================================================= # 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 diff --git a/scripts/remove b/scripts/remove index 60b3656..455f8b1 100644 --- a/scripts/remove +++ b/scripts/remove @@ -27,7 +27,7 @@ sync_port=$(ynh_app_setting_get --app=$app --key=sync_port) # REMOVE SERVICE INTEGRATION IN YUNOHOST #================================================= -# Remove the service from the list of services known by Yunohost (added from `yunohost service add`) +# Remove the service from the list of services known by YunoHost (added from `yunohost service add`) if ynh_exec_warn_less yunohost service status $app >/dev/null then ynh_script_progression --message="Removing $app service integration..." @@ -53,9 +53,9 @@ ynh_secure_remove --file="$final_path" #================================================= # REMOVE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Removing nginx web server configuration..." +ynh_script_progression --message="Removing NGINX web server configuration..." -# Remove the dedicated nginx config +# Remove the dedicated NGINX config ynh_remove_nginx_config #================================================= diff --git a/scripts/restore b/scripts/restore index a1293f9..f9eaca4 100644 --- a/scripts/restore +++ b/scripts/restore @@ -6,7 +6,7 @@ # IMPORT GENERIC HELPERS #================================================= -#Keep this path for calling _common.sh inside the execution's context of backup and restore scripts +# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers @@ -23,7 +23,7 @@ ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading settings..." +ynh_script_progression --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME @@ -56,10 +56,18 @@ ynh_exec_warn_less yunohost firewall allow TCP $sync_port #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the nginx configuration..." +ynh_script_progression --message="Restoring the NGINX web server configuration..." ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" +#================================================= +# RECREATE THE DEDICATED USER +#================================================= +ynh_script_progression --message="Recreating the dedicated system user..." + +# Create the dedicated user (if not existing) +ynh_system_user_create --username=$app --home_dir="$final_path" + #================================================= # RESTORE THE APP MAIN DIR #================================================= @@ -67,21 +75,9 @@ ynh_script_progression --message="Restoring the app main directory..." ynh_restore_file --origin_path="$final_path" -#================================================= -# RECREATE THE DEDICATED USER -#================================================= -ynh_script_progression --message="Recreating the dedicated system user..." - -# Create the dedicated user (if not existing) -ynh_system_user_create --username=$app --home_dir=$final_path - -#================================================= -# RESTORE USER RIGHTS -#================================================= -ynh_script_progression --message="Restoring user rights..." - -# Restore permissions on app files -chown -R "$app": $final_path +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:$app "$final_path" #================================================= # SPECIFIC RESTORATION @@ -95,7 +91,9 @@ ynh_restore_file --origin_path="$sync_home" --not_mandatory # Make directories and set rights mkdir -p "$sync_home" -chown -R "$app": "$sync_home" +chmod 750 "$sync_home" +chmod -R o-rwx "$sync_home" +chown -R $app:$app "$sync_home" #================================================= # RESTORE SYSTEMD @@ -110,7 +108,7 @@ systemctl enable $app.service --quiet #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description "$app daemon for Syncthing" --needs_exposed_ports $sync_port +yunohost service add $app --description="$app daemon for Syncthing" --needs_exposed_ports=$sync_port #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index ac47955..d38071a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -7,7 +7,7 @@ #================================================= source _common.sh -source detect_arch +source ynh_detect_arch__2 source /usr/share/yunohost/helpers #================================================= @@ -88,7 +88,7 @@ if [ -z $gui_port ]; then else #================================================= - # BACKUP BEFORE UPGRADE THEN ACTIVE TRAP + # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP #================================================= ynh_script_progression --message="Backing up the app before upgrading (may take a while)..." @@ -104,7 +104,7 @@ else ynh_clean_setup () { ynh_clean_check_starting - # restore it if the upgrade fails + # Restore it if the upgrade fails ynh_restore_upgradebackup } # Exit if an error occurs during the execution of the script @@ -121,6 +121,14 @@ else fi +#================================================= +# 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 --home_dir="$final_path" + #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -133,22 +141,18 @@ then ynh_setup_source --dest_dir="$final_path" --source_id=$architecture fi +chmod 750 "$final_path" +chmod -R o-rwx "$final_path" +chown -R $app:$app "$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 "gui_port" -#================================================= -# 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 --home_dir=$final_path - #================================================= # SPECIFIC UPGRADE #================================================= @@ -158,12 +162,14 @@ ynh_script_progression --message="Creating sync directory..." # Make directories and set rights mkdir -p "$sync_home" -chown -R "$app": "$sync_home" +chmod 750 "$sync_home" +chmod -R o-rwx "$sync_home" +chown -R $app:$app "$sync_home" #================================================= -# STORE THE CONFIG FILE CHECKSUM +# UPDATE A CONFIG FILE #================================================= -ynh_script_progression --message="Storing the config file checksum..." +ynh_script_progression --message="Updating a config file..." config_file="$final_path/.config/syncthing/config.xml" @@ -171,6 +177,9 @@ ynh_backup_if_checksum_is_different --file="$config_file" # Recalculate and store the checksum of the file for the next upgrade. ynh_store_file_checksum --file="$config_file" +chmod 400 "$config_file" +chown $app:$app "$config_file" + #================================================= # SETUP SYSTEMD #================================================= @@ -181,20 +190,12 @@ ynh_add_systemd_config #================================================= # GENERIC FINALIZATION -#================================================= -# SECURE FILES AND DIRECTORIES -#================================================= -ynh_script_progression --message="Securing files and directories..." - -# Set permissions on app files -chown -R $app: $final_path - #================================================= # INTEGRATE SERVICE IN YUNOHOST #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description "$app daemon for Syncthing" --needs_exposed_ports $sync_port +yunohost service add $app --description="$app daemon for Syncthing" --needs_exposed_ports=$sync_port #================================================= # START SYSTEMD SERVICE @@ -206,7 +207,7 @@ ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --lin #================================================= # 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 diff --git a/scripts/detect_arch b/scripts/ynh_detect_arch__2 similarity index 100% rename from scripts/detect_arch rename to scripts/ynh_detect_arch__2