From 7722979335d2c3ef5dd401e82923108137e5e473 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 3 Dec 2020 18:24:29 +0100 Subject: [PATCH] Upgrade to 2.263.1 --- README.md | 12 ++++-------- README_fr.md | 26 +++++++++++--------------- check_process | 2 -- conf/app.src | 6 +++--- manifest.json | 4 ++-- scripts/_common.sh | 22 ---------------------- scripts/backup | 23 ++++++----------------- scripts/change_url | 14 +++++++------- scripts/install | 4 ++-- scripts/remove | 4 ++-- scripts/restore | 2 +- scripts/upgrade | 8 ++++---- 12 files changed, 42 insertions(+), 85 deletions(-) diff --git a/README.md b/README.md index 1fc161c..2695e93 100644 --- a/README.md +++ b/README.md @@ -5,13 +5,13 @@ *[Lire ce readme en français.](./README_fr.md)* -> *This package allow you to install jenkins quickly and simply on a YunoHost server. +> *This package allow you to install Jenkins quickly and simply on a YunoHost server. If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.* ## Overview The leading open source automation server, Jenkins provides hundreds of plugins to support building, deploying and automating any project. -**Shipped version:** 2.235.2 +**Shipped version:** 2.263.1 ## Screenshots @@ -38,14 +38,11 @@ Supported, with LDAP and SSO. #### Supported architectures -* x86-64b - [![](https://ci-apps.yunohost.org/ci/logs/jenkins%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/jenkins/) +* x86-64 - [![](https://ci-apps.yunohost.org/ci/logs/jenkins%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/jenkins/) * ARMv8-A - [![](https://ci-apps-arm.yunohost.org/ci/logs/jenkins%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/jenkins/) -* Jessie x86-64b - [![](https://ci-stretch.nohost.me/ci/logs/jenkins%20%28Apps%29.svg)](https://ci-stretch.nohost.me/ci/apps/jenkins/) ## Limitations -* Can't be updated after the current version 2.46, because it need some packages not available on jessie. - ## Additionnal informations ## Links @@ -57,8 +54,7 @@ Supported, with LDAP and SSO. --- -Developers infos ----------------- +## Developers infos Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/jenkins_ynh/tree/testing). diff --git a/README_fr.md b/README_fr.md index 9c58c84..b511a8c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,13 +5,13 @@ *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer jenkins rapidement et simplement sur un serveur YunoHost. +> *Ce package vous permet d'installer Jenkins rapidement et simplement sur un serveur YunoHost. Si vous n'avez pas YunoHost, merci de regarder [ici](https://yunohost.org/#/install_fr) pour savoir comment l'installer et en profiter.* -## Résumé +## Vue d'ensemble Premier serveur d'automatisation open source, Jenkins fournit des centaines de plugins pour supporter la construction, le déploiement et l'automatisation de n'importe quel projet. -**Version embarquée:** 2.235.2 +**Version embarquée :** 2.263.1 ## Captures d'écran @@ -27,8 +27,8 @@ Utiliser le panneau d'administration de votre Jenkins pour configurer cette appl ## Documentation - * Documentation officielle: https://jenkins.io/doc/ - * Documentation YunoHost: Il n'y a pas d'autre documentation, n'hésitez pas à contribuer. + * Documentation officielle : https://jenkins.io/doc/ + * Documentation YunoHost : Il n'y a pas d'autre documentation, n'hésitez pas à contribuer. ## Fonctionnalités spécifiques à YunoHost @@ -38,27 +38,23 @@ Supportée, avec LDAP et SSO. #### Architectures supportées. -* x86-64b - [![](https://ci-apps.yunohost.org/ci/logs/jenkins%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/jenkins/) +* x86-64 - [![](https://ci-apps.yunohost.org/ci/logs/jenkins%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/jenkins/) * ARMv8-A - [![](https://ci-apps-arm.yunohost.org/ci/logs/jenkins%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/jenkins/) -* Jessie x86-64b - [![](https://ci-stretch.nohost.me/ci/logs/jenkins%20%28Apps%29.svg)](https://ci-stretch.nohost.me/ci/apps/jenkins/) ## Limitations -* Ne peut pas être mis à jour après la version actuelle 2.46, car il a besoin de certains paquets qui ne sont pas disponibles sur jessie. - ## Informations additionnelles ## Liens - * Reporter un bug: https://github.com/YunoHost-Apps/jenkins_ynh/issues - * Site de jenkins: https://jenkins.io - * Dépôt git de jenkins: https://github.com/jenkinsci/jenkins - * Site de YunoHost: https://yunohost.org/ + * Reporter un bug : https://github.com/YunoHost-Apps/jenkins_ynh/issues + * Site de jenkins : https://jenkins.io + * Dépôt git de Jenkins : https://github.com/jenkinsci/jenkins + * Site de YunoHost : https://yunohost.org/ --- -Informations à l'intention des développeurs ----------------- +## Informations à l'intention des développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/jenkins_ynh/tree/testing). diff --git a/check_process b/check_process index 8c878e0..ff22049 100644 --- a/check_process +++ b/check_process @@ -17,8 +17,6 @@ incorrect_path=1 port_already_use=1 (8080) change_url=1 -;;; Levels - Level 5=auto ;;; Options Email= Notification=down diff --git a/conf/app.src b/conf/app.src index 4b35df4..fe47360 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,6 +1,6 @@ -SOURCE_URL=https://pkg.jenkins.io/debian-stable/binary/jenkins_2.235.2_all.deb -SOURCE_SUM=536f5486831243337312e7995a10b993 -SOURCE_SUM_PRG=md5sum +SOURCE_URL=https://pkg.jenkins.io/debian-stable/binary/jenkins_2.263.1_all.deb +SOURCE_SUM=faae72cc486c3032be31d47ddcaa7bce77aba54ad6bb900ec73550f8096348ba +SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=true SOURCE_FILENAME=jenkins.deb diff --git a/manifest.json b/manifest.json index aba0f02..6ea98dd 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.235.2~ynh1", + "version": "2.263.1~ynh1", "url": "https://jenkins.io/index.html", "license": "MIT", "maintainer": { @@ -18,7 +18,7 @@ "email": "maniackc_dev@crudelis.fr" }], "requirements": { - "yunohost": ">= 3.5.0" + "yunohost": ">= 4.0.0" }, "multi_instance": false, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index 524416b..06458e4 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,28 +4,6 @@ # PERSONAL HELPERS #================================================= -#================================================= -# BACKUP -#================================================= - -HUMAN_SIZE () { # Transforme une taille en Ko en une taille lisible pour un humain - human=$(numfmt --to=iec --from-unit=1K $1) - echo $human -} - -CHECK_SIZE () { # Vérifie avant chaque backup que l'espace est suffisant - file_to_analyse=$1 - backup_size=$(du --summarize "$file_to_analyse" | cut -f1) - free_space=$(df --output=avail "/home/yunohost.backup" | sed 1d) - - if [ $free_space -le $backup_size ] - then - ynh_print_err "Espace insuffisant pour sauvegarder $file_to_analyse." - ynh_print_err "Espace disponible: $(HUMAN_SIZE $free_space)" - ynh_die "Espace nécessaire: $(HUMAN_SIZE $backup_size)" - fi -} - #================================================= # PACKAGE CHECK BYPASSING... #================================================= diff --git a/scripts/backup b/scripts/backup index 736d88f..7e8dd97 100644 --- a/scripts/backup +++ b/scripts/backup @@ -22,7 +22,7 @@ ynh_abort_if_errors #================================================= # LOAD SETTINGS #================================================= -ynh_script_progression --message="Loading installation settings..." --weight=3 +ynh_print_info --message="Loading installation settings..." app=$YNH_APP_INSTANCE_NAME @@ -30,22 +30,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_script_progression --message="Backing up the main app directory..." --weight=15 -ynh_systemd_action --action=stop --service_name=jenkins -sleep 1 - -CHECK_SIZE "$final_path" ynh_backup --src_path="$final_path" #================================================= # BACKUP THE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Backing up nginx web server configuration..." ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" @@ -57,16 +54,8 @@ ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" ynh_backup --src_path=/etc/default/$app -#================================================= -# CHECK JENKINS STARTING -#================================================= -ynh_script_progression --message="Restarting Jenkins..." --weight=20 - -# Wait for Jenkins to be fully started -ynh_systemd_action --line_match="Jenkins is fully up and running" --log_path="/var/log/$app/$app.log" --timeout="300" - #================================================= # END OF SCRIPT #================================================= -ynh_script_progression --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." --last +ynh_print_info --message="Backup script completed for $app. (YunoHost will then actually copy those files to the archive)." diff --git a/scripts/change_url b/scripts/change_url index 92a141c..e95c923 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -68,28 +68,28 @@ ynh_abort_if_errors #================================================= # MODIFY URL IN NGINX CONF #================================================= -ynh_script_progression --message="Updating nginx web server configuration..." --weight=5 +ynh_script_progression --message="Updating NGINX web server configuration..." --weight=5 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" # Store path_url setting ynh_app_setting_set --app=$app --key=path_url --value="$path_url" - # Create a dedicated nginx config + # Create a dedicated NGINX config ynh_add_nginx_config 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 @@ -105,7 +105,7 @@ fi #================================================= # MODIFY JENKINS SETUP #================================================= -ynh_script_progression --message="Updating jenkins setup..." +ynh_script_progression --message="Updating Jenkins setup..." if [ $change_path -eq 1 ] then diff --git a/scripts/install b/scripts/install index 1b5ea60..ba3821b 100644 --- a/scripts/install +++ b/scripts/install @@ -82,9 +82,9 @@ ynh_install_app_dependencies $app_depencencies #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Configuring nginx web server..." --weight=2 +ynh_script_progression --message="Configuring NGINX web server..." --weight=2 -# Create a dedicated nginx config +# Create a dedicated NGINX config ynh_add_nginx_config #================================================= diff --git a/scripts/remove b/scripts/remove index 13363b7..c80f0b7 100644 --- a/scripts/remove +++ b/scripts/remove @@ -44,9 +44,9 @@ ynh_secure_remove --file="/var/lib/jenkins" #================================================= # REMOVE THE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Removing nginx web server configuration..." --weight=2 +ynh_script_progression --message="Removing NGINX web server configuration..." --weight=2 -# Remove the dedicated nginx config +# Remove the dedicated NGINX config ynh_remove_nginx_config #================================================= diff --git a/scripts/restore b/scripts/restore index 2230f9d..6c0c43c 100644 --- a/scripts/restore +++ b/scripts/restore @@ -123,7 +123,7 @@ ynh_restore_file --origin_path=/etc/default/$app # ADVERTISE SERVICE IN ADMIN PANEL #================================================= -yunohost service add $app --log "/var/log/$app/$app.log" +yunohost service add $app --log="/var/log/$app/$app.log" #================================================= # CHECK JENKINS STARTING diff --git a/scripts/upgrade b/scripts/upgrade index 67cc22e..a1eb8ba 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -33,7 +33,7 @@ upgrade_type=$(ynh_check_app_version_changed) #================================================= # ENSURE DOWNWARD COMPATIBILITY #================================================= -ynh_script_progression --message="Ensuring downward compatibility..." +ynh_script_progression --message="Ensuring downward compatibility..." --weight=2 # Fix is_public as a boolean if [ "$is_public" = "Yes" ]; then @@ -122,9 +122,9 @@ ynh_install_app_dependencies $app_depencencies # Overwrite the nginx configuration only if it's allowed if [ $overwrite_nginx -eq 1 ] then - ynh_script_progression --message="Upgrading nginx web server configuration..." --weight=4 + ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=4 - # Create a dedicated nginx config + # Create a dedicated NGINX config ynh_add_nginx_config fi @@ -143,7 +143,7 @@ fi #================================================= # RELOAD NGINX #================================================= -ynh_script_progression --message="Reloading nginx web server..." --weight=2 +ynh_script_progression --message="Reloading NGINX web server..." --weight=2 ynh_systemd_action --action=reload --service_name=nginx