From 46bc6808221f7cde133eaaadc6d9e0d75d19c72b Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 8 Dec 2021 22:31:34 +0100 Subject: [PATCH 1/2] 2.319.1 --- check_process | 17 ++++++++--------- conf/app.src | 4 ++-- config_panel.json | 41 ----------------------------------------- config_panel.toml | 24 ++++++++++++++++++++++++ manifest.json | 7 +++---- scripts/config | 23 +---------------------- 6 files changed, 38 insertions(+), 78 deletions(-) delete mode 100644 config_panel.json create mode 100644 config_panel.toml diff --git a/check_process b/check_process index c85db35..19880d7 100644 --- a/check_process +++ b/check_process @@ -14,26 +14,25 @@ # 2.150.2~ynh2 #upgrade=1 from_commit=29141b702f2954e0f72925121aea82a7fa3fc118 # 2.263.1~ynh1 - upgrade=1 from_commit=0e1aae7be82034650e2c1f6c1ad6d68a41b80176 + #upgrade=1 from_commit=0e1aae7be82034650e2c1f6c1ad6d68a41b80176 # 2.263.4~ynh1 - upgrade=1 from_commit=72656bca2e144ef9a92cfec2af6cd13cb8e8aee3 + #upgrade=1 from_commit=72656bca2e144ef9a92cfec2af6cd13cb8e8aee3 # 2.277.2~ynh1 - upgrade=1 from_commit=e6cf48fdbcc7cac5c5147d4a7cc1ebfd9055bfef + #upgrade=1 from_commit=e6cf48fdbcc7cac5c5147d4a7cc1ebfd9055bfef # 2.277.3~ynh1 - upgrade=1 from_commit=3f0f52e24273e9da86ac2fa7000953b7734196a5 + #upgrade=1 from_commit=3f0f52e24273e9da86ac2fa7000953b7734196a5 # 2.277.4~ynh1 - upgrade=1 from_commit=36fdba9bbd201832f5707083b878ae967052ad6a + #upgrade=1 from_commit=36fdba9bbd201832f5707083b878ae967052ad6a # 2.289.1~ynh1 - upgrade=1 from_commit=abf516d8a4dd721af8b9a2560a2a1dbd7ea79fb8 + #upgrade=1 from_commit=abf516d8a4dd721af8b9a2560a2a1dbd7ea79fb8 # 2.289.2~ynh1 - upgrade=1 from_commit=c7a3a24e56e9be3b5991a175d08be116392b5a19 + #upgrade=1 from_commit=c7a3a24e56e9be3b5991a175d08be116392b5a19 # 2.289.3~ynh1 - upgrade=1 from_commit=f165327adcc291a479ab73050bcaa1b84784e763 + #upgrade=1 from_commit=f165327adcc291a479ab73050bcaa1b84784e763 # 2.303.1~ynh1 upgrade=1 from_commit=0bb8a4ca3a90693c5594a72379704f7e08519c92 backup_restore=1 multi_instance=0 - port_already_use=1 (8080) change_url=1 ;;; Options Email= diff --git a/conf/app.src b/conf/app.src index 4a5384d..28c9d4a 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://pkg.jenkins.io/debian-stable/binary/jenkins_2.303.2_all.deb -SOURCE_SUM=1a39e8e856d3f9c42ba694012995be323148e2df27f7991c85aaf81f34e2aa08 +SOURCE_URL=https://pkg.jenkins.io/debian-stable/binary/jenkins_2.319.1_all.deb +SOURCE_SUM=ff455afebe2f63d0c3a891071478b1f5a36ba622422a10dcd91d1b4aeba4a05e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=deb SOURCE_IN_SUBDIR=true diff --git a/config_panel.json b/config_panel.json deleted file mode 100644 index 3ce8e1e..0000000 --- a/config_panel.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "name": "Jenkins configuration panel", - "version": "0.1", - "panel": [{ - "name": "Jenkins configuration", - "id": "main", - "sections": [{ - "name": "Public access", - "id": "is_public", - "options": [{ - "name": "Is it a public app?", - "id": "is_public", - "type": "bool", - "default": true - }] - }, - { - "name": "Overwriting config files", - "id": "overwrite_files", - "options": [{ - "name": "Overwrite the NGINX config file?", - "help": "If the file is overwritten, a backup will be created.", - "id": "overwrite_nginx", - "type": "bool", - "default": true - }] - }, - { - "name": "Global configuration", - "id": "global_config", - "options": [{ - "name": "Send HTML email to admin?", - "help": "Allow app scripts to send HTML mails instead of plain text.", - "id": "email_type", - "type": "bool", - "default": true - }] - }] - } -] -} diff --git a/config_panel.toml b/config_panel.toml new file mode 100644 index 0000000..b30c273 --- /dev/null +++ b/config_panel.toml @@ -0,0 +1,24 @@ +version = "1.0" + +[main] +name = "Jenkins configuration" + + [main.overwrite_files] + name = "Overwriting config files" + + [main.overwrite_files.overwrite_nginx] + ask = "Overwrite the NGINX config file?" + type = "boolean" + default = true + help = "If the file is overwritten, a backup will be created." + + + [main.global_config] + name = "Global configuration" + + [main.global_config.email_type] + ask = "Send HTML email to admin?" + type = "boolean" + default = true + help = "Allow app scripts to send HTML mails instead of plain text." + \ No newline at end of file diff --git a/manifest.json b/manifest.json index 46527b2..77c9a98 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.303.2~ynh1", + "version": "2.319.1~ynh1", "url": "https://jenkins.io/index.html", "upstream": { "license": "MIT", @@ -23,7 +23,7 @@ "email": "maniackc_dev@crudelis.fr" }], "requirements": { - "yunohost": ">= 4.1.3" + "yunohost": ">= 4.3.0" }, "multi_instance": false, "services": [ @@ -33,8 +33,7 @@ "install" : [ { "name": "domain", - "type": "domain", - "example": "example.com" + "type": "domain" }, { "name": "path", diff --git a/scripts/config b/scripts/config index 7451436..d65196f 100644 --- a/scripts/config +++ b/scripts/config @@ -28,11 +28,6 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path) # If the form has a value for a variable, take the value from the form, # Otherwise, keep the value from the app config. -# is_public -old_is_public="$(ynh_app_setting_get --app=$app --key=is_public)" -old_is_public=$(bool_to_true_false $old_is_public) -is_public="${YNH_CONFIG_MAIN_IS_PUBLIC_IS_PUBLIC:-$old_is_public}" - # Overwrite nginx configuration old_overwrite_nginx="$(ynh_app_setting_get --app=$app --key=overwrite_nginx)" old_overwrite_nginx=$(bool_to_true_false $old_overwrite_nginx) @@ -51,8 +46,6 @@ show_config() { # here you are supposed to read some config file/database/other then print the values # echo "YNH_CONFIG_${PANEL_ID}_${SECTION_ID}_${OPTION_ID}=value" - echo "YNH_CONFIG_MAIN_IS_PUBLIC_IS_PUBLIC=$is_public" - echo "YNH_CONFIG_MAIN_OVERWRITE_FILES_OVERWRITE_NGINX=$overwrite_nginx" echo "YNH_CONFIG_MAIN_GLOBAL_CONFIG_EMAIL_TYPE=$admin_mail_html" @@ -64,14 +57,6 @@ show_config() { apply_config() { - # Change public accessibility - if [ "$is_public" = "true" ] - then - yunohost app action run $app public_private --args is_public=1 - else - yunohost app action run $app public_private --args is_public=0 - fi - # Set overwrite_nginx overwrite_nginx=$(bool_to_01 $overwrite_nginx) ynh_app_setting_set --app=$app --key=overwrite_nginx --value="$overwrite_nginx" @@ -84,10 +69,4 @@ apply_config() { #================================================= # GENERIC FINALIZATION #================================================= -# SELECT THE ACTION FOLLOWING THE GIVEN ARGUMENT -#================================================= - -case $1 in - show) show_config;; - apply) apply_config;; -esac +ynh_app_config_run $1 From 7127d03e8a42741f73257829eddf7acc3c46f46c Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Wed, 8 Dec 2021 21:31:40 +0000 Subject: [PATCH 2/2] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 93fce64..ad37d0d 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.303.2~ynh1 +**Shipped version:** 2.319.1~ynh1 diff --git a/README_fr.md b/README_fr.md index d2eef64..3ddb784 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Serveur d'intégration continue extensible -**Version incluse :** 2.303.2~ynh1 +**Version incluse :** 2.319.1~ynh1