diff --git a/conf/app.src b/conf/app.src index 9738c1b..340b645 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,6 @@ -SOURCE_URL=https://github.com/matrix-org/dendrite/archive/v0.5.0.zip -SOURCE_SUM=0e2923f19c90b808a1cd8bed3649cbd3c6b29ceb9c8d35716c92890a40d70c5b +SOURCE_URL=https://github.com/matrix-org/dendrite/archive/v0.5.1.zip +SOURCE_SUM=8df61627d3209f4ff529cbac8318a3a9da274de527f858fdb72578988a5aeefe SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= SOURCE_EXTRACT=true diff --git a/manifest.json b/manifest.json index 6dfc185..221f315 100644 --- a/manifest.json +++ b/manifest.json @@ -6,13 +6,12 @@ "en": "Matrix homeserver of second generation", "fr": "Serveur Matrix de seconde génération" }, - "version": "0.5.0~ynh1", + "version": "0.5.1~ynh1", "url": "https://matrix.org/", "upstream": { "license": "Apache-2.0", "website": "https://matrix.org/", "admindoc": "https://github.com/matrix-org/dendrite/tree/master/docs", - "userdoc": "https://yunohost.org/apps", "code": "https://github.com/matrix-org/dendrite" }, "license": "Apache-2.0", @@ -21,7 +20,7 @@ "email": "tituspijean@outlook.com" }, "requirements": { - "yunohost": ">= 4.1.7" + "yunohost": ">= 4.3.0" }, "multi_instance": true, "services": [ diff --git a/scripts/install b/scripts/install index e6626f7..d03d6b6 100644 --- a/scripts/install +++ b/scripts/install @@ -129,7 +129,7 @@ adduser $app ssl-cert # BUILDING SOURCES AND SETTING UP THE SERVER #================================================= -pushd "$final_path" || ynh_die +pushd "$final_path" ynh_script_progression --message="Building the sources (it will take some time)..." --weight=6 # Build the sources mkdir ./bin @@ -139,7 +139,7 @@ pushd "$final_path" || ynh_die ./bin/generate-keys --private-key matrix_key.pem # Generate a self-signed certificate ./bin/generate-keys --tls-cert server.crt --tls-key server.key -popd || ynh_die +popd # Allow or deny registration based of is_public registration=false diff --git a/scripts/upgrade b/scripts/upgrade index d4fa3a3..f490dbc 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -70,7 +70,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=3 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" + ynh_setup_source --dest_dir="$final_path" --keep="$final_path/dendrite.yaml" fi #================================================= @@ -112,11 +112,11 @@ ynh_system_user_create --username=$app # BUILDING SOURCES AND SETTING UP THE SERVER #================================================= -pushd "$final_path" || ynh_die +pushd "$final_path" ynh_script_progression --message="Building the sources (it will take some time)..." --weight=6 # Build the sources ynh_exec_warn_less ./build.sh -popd || ynh_die +popd #================================================= # SETUP SYSTEMD @@ -126,10 +126,6 @@ ynh_script_progression --message="Upgrading systemd configuration..." --weight=1 # Create a dedicated systemd config ynh_add_systemd_config -#================================================= -# MODIFY A CONFIG FILE -#================================================= - #================================================= # GENERIC FINALIZATION #=================================================