diff --git a/README.md b/README.md index 0245127..07276e2 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Extendable continuous integration server -**Shipped version:** 2.332.3~ynh1 +**Shipped version:** 2.346.1~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index fb09a90..b879076 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Serveur d'intégration continue extensible -**Version incluse :** 2.332.3~ynh1 +**Version incluse :** 2.346.1~ynh1 ## Captures d'écran diff --git a/check_process b/check_process index 5a6d2e3..702d737 100644 --- a/check_process +++ b/check_process @@ -37,6 +37,8 @@ upgrade=1 from_commit=7e40418b50b5c25d80f3bc521f9627cdd22c4201 # 2.319.3~ynh1 upgrade=1 from_commit=ceac884c4d82f8164ec7ce391d354d794948bb72 + # 2.332.3~ynh1 + upgrade=1 from_commit=5ff1883636f649c7e32d6b520fd54621f83097ba backup_restore=1 multi_instance=0 change_url=1 diff --git a/conf/app.src b/conf/app.src index 371a178..13cdfa2 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://pkg.jenkins.io/debian-stable/binary/jenkins_2.332.3_all.deb -SOURCE_SUM=319fa6ab596f63b826a9ab6ba5a7230aff73d271acc6241ffb23788ffc123883 +SOURCE_URL=https://pkg.jenkins.io/debian-stable/binary/jenkins_2.346.1_all.deb +SOURCE_SUM=cc5b6caca616f7aa4755fadddd8eafefe8bd74be25b422eebd4a2a978c6bb015 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=true diff --git a/conf/nginx.conf b/conf/nginx.conf index 5771bc8..83be30b 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -26,6 +26,6 @@ location __PATH__ { proxy_busy_buffers_size 64k; proxy_temp_file_write_size 64k; - # Include SSOWAT user panel. - include conf.d/yunohost_panel.conf.inc; + # Include SSOWAT user panel. + include conf.d/yunohost_panel.conf.inc; } diff --git a/manifest.json b/manifest.json index df46437..f9b2d59 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Extendable continuous integration server", "fr": "Serveur d'intégration continue extensible" }, - "version": "2.332.3~ynh1", + "version": "2.346.1~ynh1", "url": "https://jenkins.io/index.html", "upstream": { "license": "MIT", @@ -30,7 +30,7 @@ "nginx" ], "arguments": { - "install" : [ + "install": [ { "name": "domain", "type": "domain" diff --git a/scripts/restore b/scripts/restore index 57a42f8..e9cb2f9 100644 --- a/scripts/restore +++ b/scripts/restore @@ -46,13 +46,6 @@ test ! -d $final_path \ #================================================= # STANDARD RESTORATION STEPS -#================================================= -# RESTORE 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 #================================================= @@ -71,6 +64,13 @@ ynh_script_progression --message="Reinstalling dependencies..." # Define and install dependencies ynh_install_app_dependencies $pkg_dependencies +#================================================= +# RESTORE 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" + #================================================= # INSTALL JENKINS #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index ef79f2e..73baa5e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -130,6 +130,13 @@ then ynh_systemd_action --service_name=$app --action="restart" --line_match="Started Jenkins Continuous Integration Server" --log_path="systemd" fi +#================================================= +# UPGRADE DEPENDENCIES +#================================================= +ynh_script_progression --message="Upgrading dependencies..." + +ynh_install_app_dependencies $pkg_dependencies + #================================================= # NGINX CONFIGURATION #================================================= @@ -143,13 +150,6 @@ then ynh_add_nginx_config fi -#================================================= -# UPGRADE DEPENDENCIES -#================================================= -ynh_script_progression --message="Upgrading dependencies..." - -ynh_install_app_dependencies $pkg_dependencies - #================================================= # SPECIFIC UPGRADE #=================================================