diff --git a/README.md b/README.md index a5a4aaa..3e15025 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Jenkins for YunoHost -[![Integration level](https://dash.yunohost.org/integration/jenkins.svg)](https://dash.yunohost.org/appci/app/jenkins) ![Working status](https://ci-apps.yunohost.org/ci/badges/jenkins.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/jenkins.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/jenkins.svg)](https://ci-apps.yunohost.org/ci/apps/jenkins/) ![Working status](https://ci-apps.yunohost.org/ci/badges/jenkins.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/jenkins.maintain.svg) [![Install Jenkins with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=jenkins) diff --git a/README_es.md b/README_es.md index 1d436f2..2d6e29f 100644 --- a/README_es.md +++ b/README_es.md @@ -5,7 +5,7 @@ No se debe editar a mano. # Jenkins para Yunohost -[![Nivel de integración](https://dash.yunohost.org/integration/jenkins.svg)](https://dash.yunohost.org/appci/app/jenkins) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/jenkins.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/jenkins.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/jenkins.svg)](https://ci-apps.yunohost.org/ci/apps/jenkins/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/jenkins.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/jenkins.maintain.svg) [![Instalar Jenkins con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=jenkins) diff --git a/README_eu.md b/README_eu.md index 331d5be..3a4342f 100644 --- a/README_eu.md +++ b/README_eu.md @@ -5,7 +5,7 @@ EZ editatu eskuz. # Jenkins YunoHost-erako -[![Integrazio maila](https://dash.yunohost.org/integration/jenkins.svg)](https://dash.yunohost.org/appci/app/jenkins) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/jenkins.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/jenkins.maintain.svg) +[![Integrazio maila](https://dash.yunohost.org/integration/jenkins.svg)](https://ci-apps.yunohost.org/ci/apps/jenkins/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/jenkins.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/jenkins.maintain.svg) [![Instalatu Jenkins YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=jenkins) diff --git a/README_fr.md b/README_fr.md index 0b56cd7..cebd264 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main. # Jenkins pour YunoHost -[![Niveau d’intégration](https://dash.yunohost.org/integration/jenkins.svg)](https://dash.yunohost.org/appci/app/jenkins) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/jenkins.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/jenkins.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/jenkins.svg)](https://ci-apps.yunohost.org/ci/apps/jenkins/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/jenkins.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/jenkins.maintain.svg) [![Installer Jenkins avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=jenkins) diff --git a/README_gl.md b/README_gl.md index 6a7d3ba..0d0e98b 100644 --- a/README_gl.md +++ b/README_gl.md @@ -5,7 +5,7 @@ NON debe editarse manualmente. # Jenkins para YunoHost -[![Nivel de integración](https://dash.yunohost.org/integration/jenkins.svg)](https://dash.yunohost.org/appci/app/jenkins) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/jenkins.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/jenkins.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/jenkins.svg)](https://ci-apps.yunohost.org/ci/apps/jenkins/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/jenkins.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/jenkins.maintain.svg) [![Instalar Jenkins con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=jenkins) diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 8068701..eb8f1cc 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -5,7 +5,7 @@ # YunoHost 上的 Jenkins -[![集成程度](https://dash.yunohost.org/integration/jenkins.svg)](https://dash.yunohost.org/appci/app/jenkins) ![工作状态](https://ci-apps.yunohost.org/ci/badges/jenkins.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/jenkins.maintain.svg) +[![集成程度](https://dash.yunohost.org/integration/jenkins.svg)](https://ci-apps.yunohost.org/ci/apps/jenkins/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/jenkins.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/jenkins.maintain.svg) [![使用 YunoHost 安装 Jenkins](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=jenkins) diff --git a/config_panel.toml b/config_panel.toml deleted file mode 100644 index 6e2862c..0000000 --- a/config_panel.toml +++ /dev/null @@ -1,13 +0,0 @@ -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." diff --git a/manifest.toml b/manifest.toml index e1d4c1d..506149a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -25,9 +25,9 @@ architectures = "all" multi_instance = false ldap = true sso = false -disk = "50M" # FIXME: replace with an **estimate** minimum disk requirement. e.g. 20M, 400M, 1G, ... -ram.build = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ... -ram.runtime = "50M" # FIXME: replace with an **estimate** minimum ram requirement. e.g. 50M, 400M, 1G, ... +disk = "50M" +ram.build = "50M" +ram.runtime = "50M" [install] [install.domain] diff --git a/scripts/config b/scripts/config deleted file mode 100644 index b6336de..0000000 --- a/scripts/config +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -#================================================= -# IMPORT GENERIC HELPERS -#================================================= - -source _common.sh -source /usr/share/yunohost/helpers - -#================================================= -# LOAD VALUES -#================================================= - -# Load the real value from the app config or elsewhere. -# Then get the value from the form. -# If the form has a value for a variable, take the value from the form, -# Otherwise, keep the value from the app config. - -# Overwrite nginx configuration -old_overwrite_nginx="$(ynh_app_setting_get --app="$app" --key="overwrite_nginx")" -old_overwrite_nginx=$(b01_to_bool "$old_overwrite_nginx") -overwrite_nginx="${YNH_CONFIG_MAIN_OVERWRITE_FILES_OVERWRITE_NGINX:-$old_overwrite_nginx}" - -#================================================= -# SHOW_CONFIG FUNCTION FOR 'SHOW' COMMAND -#================================================= - -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_OVERWRITE_FILES_OVERWRITE_NGINX=$overwrite_nginx" -} - -#================================================= -# MODIFY THE CONFIGURATION -#================================================= - -apply_config() { - # Set overwrite_nginx - overwrite_nginx=$(bool_to_01 "$overwrite_nginx") - ynh_app_setting_set --app="$app" --key=overwrite_nginx --value="$overwrite_nginx" -} - -#================================================= -# GENERIC FINALIZATION -#================================================= -ynh_app_config_run "$1" diff --git a/scripts/install b/scripts/install index 396a233..20e9ecb 100644 --- a/scripts/install +++ b/scripts/install @@ -12,7 +12,6 @@ source /usr/share/yunohost/helpers #================================================= jenkins_version=$(ynh_app_upstream_version) -ynh_app_setting_set --app="$app" --key="overwrite_nginx" --value="1" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE diff --git a/scripts/upgrade b/scripts/upgrade index 6c657f2..a52c494 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -19,12 +19,6 @@ ynh_systemd_action --service_name="$app" --action="stop" --log_path="systemd" #================================================= ynh_script_progression --message="Ensuring downward compatibility..." -# If overwrite_nginx doesn't exist, create it -if [ -z "${overwrite_nginx:-}" ]; then - overwrite_nginx=1 - ynh_app_setting_set --app="$app" --key="overwrite_nginx" --value="$overwrite_nginx" -fi - # Remove the apt list entry for jenkins if [ -e "/etc/apt/sources.list.d/jenkins.list" ]; then ynh_secure_remove --file=/etc/apt/sources.list.d/jenkins.list @@ -84,10 +78,7 @@ done #================================================= ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1 -# Overwrite the nginx configuration only if it's allowed -if [ "$overwrite_nginx" -eq 1 ]; then - ynh_add_nginx_config -fi +ynh_add_nginx_config yunohost service add "$app" --description="Jenkins Continuous Integration Server"