diff --git a/README.md b/README.md index 715b474..970f083 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to ## Overview Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third party and how it's transmitted over the Internet. -**Shipped version:** 1.4.2 +**Shipped version:** 1.5.0 ## Screenshots diff --git a/check_process b/check_process index 1899a72..f6c3e49 100644 --- a/check_process +++ b/check_process @@ -22,6 +22,8 @@ upgrade=1 from_commit=2b2b346b2d154653ff2affb5679a7cd8d60892fa # 1.4.0 upgrade=1 from_commit=cfd8f2894d381f0b1149b1061dff695c0941fcc3 + # 1.4.2 + upgrade=1 from_commit=a351c2b6431a3ac092f3581a9778a402ec81f963 backup_restore=1 multi_instance=0 # This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version. @@ -34,3 +36,12 @@ ;;; Options Email=yalh@yahoo.com Notification=all +;;; Upgrade options + ; commit=571623f6ea0dc6310a8d6b991b03c4a84337ce92 + name=1.1.1 + ; commit=2b2b346b2d154653ff2affb5679a7cd8d60892fa + name=1.3.3 + ; commit=cfd8f2894d381f0b1149b1061dff695c0941fcc3 + name=1.4.0 + ; commit=a351c2b6431a3ac092f3581a9778a402ec81f963 + name=1.4.2 diff --git a/conf/arm.src b/conf/arm.src index 0c50176..3971089 100644 --- a/conf/arm.src +++ b/conf/arm.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/syncthing/syncthing/releases/download/v1.4.2/syncthing-linux-arm-v1.4.2.tar.gz -SOURCE_SUM=f314dabbad3b49ae539764a8d5819158e629a0ea8b6a41cffab9547800ec80a2 +SOURCE_URL=https://github.com/syncthing/syncthing/releases/download/v1.5.0/syncthing-linux-arm-v1.5.0.tar.gz +SOURCE_SUM=3662d6758b47801244fe27cfdc2a4ada660243764747935bd15311f06184949e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/arm64.src b/conf/arm64.src index 0ae9783..d779312 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/syncthing/syncthing/releases/download/v1.4.2/syncthing-linux-arm64-v1.4.2.tar.gz -SOURCE_SUM=8b75f9ae942eb0d41369cdce69c176bcee9dafa26b336fefc3678cd4043503f4 +SOURCE_URL=https://github.com/syncthing/syncthing/releases/download/v1.5.0/syncthing-linux-arm64-v1.5.0.tar.gz +SOURCE_SUM=af802a0bb5c087e2e62496f81ef31708c849d6c3a34334ef59f3716b00230b10 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/i386.src b/conf/i386.src index c13999c..4cb28e5 100644 --- a/conf/i386.src +++ b/conf/i386.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/syncthing/syncthing/releases/download/v1.4.2/syncthing-linux-386-v1.4.2.tar.gz -SOURCE_SUM=53d035152c7c5dfce44cc132c724b4e04123fa52449ed067fed6a7522351cb31 +SOURCE_URL=https://github.com/syncthing/syncthing/releases/download/v1.5.0/syncthing-linux-386-v1.5.0.tar.gz +SOURCE_SUM=3ae99641ecf7ed8c551b7bc6ad57a3779c6eb2452eff07a97f249e11f68495c5 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/x86-64.src b/conf/x86-64.src index e57352f..1af911e 100644 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/syncthing/syncthing/releases/download/v1.4.2/syncthing-linux-amd64-v1.4.2.tar.gz -SOURCE_SUM=27360f1bbece883278686bd8714eaa28c0507699a4d1a98045d4efea27c9fb7f +SOURCE_URL=https://github.com/syncthing/syncthing/releases/download/v1.5.0/syncthing-linux-amd64-v1.5.0.tar.gz +SOURCE_SUM=9414297f52a2807608ab6135c6c6e3e1db73b3c89d81d935bcf9df4d340a498a SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 62412e8..9ca0f3e 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized.", "fr": "Syncthing remplace les services propriétaires de synchro et de cloud avec quelque chose d'ouvert, digne de confiance et décentralisée." }, - "version": "1.4.2~ynh1", + "version": "1.5.0~ynh1", "url": "https://syncthing.net/", "license": "MPL-2.0", "maintainer": [ diff --git a/scripts/backup b/scripts/backup index ae55ea1..270e87f 100644 --- a/scripts/backup +++ b/scripts/backup @@ -32,18 +32,19 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) domain=$(ynh_app_setting_get --app=$app --key=domain) #================================================= -# STANDARD BACKUP STEPS +# DECLARE DATA AND CONF FILES TO BACKUP +#================================================= +ynh_print_info --message="Declaring files to be backed up..." + #================================================= # BACKUP THE APP MAIN DIR #================================================= -ynh_print_info --message="Backing up the main app directory..." ynh_backup --src_path="$final_path" #================================================= # BACKUP THE NGINX CONFIGURATION #================================================= -ynh_print_info --message="Backing up nginx web server configuration..." ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" @@ -52,7 +53,6 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= # BACKUP SYSTEMD #================================================= -ynh_print_info --message="Backing up systemd configuration..." ynh_backup --src_path="/etc/systemd/system/$app.service" diff --git a/scripts/install b/scripts/install index f3c712c..bbf98b7 100644 --- a/scripts/install +++ b/scripts/install @@ -164,7 +164,7 @@ chown -R $app: $final_path #================================================= ynh_print_info --message="Integrating service in YunoHost..." -yunohost service add $app --description "$app daemon for Syncthing" +yunohost service add $app --description "$app daemon for Syncthing" --log_type "systemd" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/restore b/scripts/restore index 91a94d2..b4b1afe 100644 --- a/scripts/restore +++ b/scripts/restore @@ -98,7 +98,7 @@ systemctl enable $app.service #================================================= ynh_print_info --message="Integrating service in YunoHost..." -yunohost service add $app --description "$app daemon for Syncthing" +yunohost service add $app --description "$app daemon for Syncthing" --log_type "systemd" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index baf88c5..b2f60a8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -167,6 +167,13 @@ ynh_print_info --message="Upgrading systemd configuration..." # Create a dedicated systemd config ynh_add_systemd_config +#================================================= +# INTEGRATE SERVICE IN YUNOHOST +#================================================= +ynh_print_info --message="Integrating service in YunoHost..." + +yunohost service add $app --description "$app daemon for Syncthing" --log_type "systemd" + #================================================= # GENERIC FINALIZATION #=================================================