From 336039d43f0a58020d4157a4be0d55abd3956963 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Sun, 13 Jan 2019 18:07:28 +0100 Subject: [PATCH] English translation and typo --- scripts/actions/public_private | 2 +- scripts/change_url | 4 +-- scripts/install | 58 ++++++++++++++++++++-------------- scripts/remove | 9 ++++-- scripts/restore | 17 +++++----- scripts/upgrade | 15 +++++---- 6 files changed, 61 insertions(+), 44 deletions(-) diff --git a/scripts/actions/public_private b/scripts/actions/public_private index 21c486a..7af7bde 100755 --- a/scripts/actions/public_private +++ b/scripts/actions/public_private @@ -42,7 +42,7 @@ fi if [ $is_public -eq 0 ] then ynh_app_setting_delete $app unprotected_uris - # /path/github-webhook has to be accessible + # /path/github-webhook has to be accessible for github's webhooks ynh_app_setting_set $app skipped_uris "/github-webhook" pour les webhooks de github. else ynh_app_setting_delete $app skipped_uris diff --git a/scripts/change_url b/scripts/change_url index 8a7ffa8..cb24ddd 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -114,7 +114,7 @@ fi if [ $change_path -eq 1 ] then - # Ajoute le path en cas d'installation en sous-dossier dans les options de démarrage de Jenkins + # Add the path, in case of sub-path installation, into jenkins' boot options # Change to root if [ "$new_path" == "/" ] @@ -135,7 +135,7 @@ fi # RESTART JENKINS IN BACKGROUND #================================================= -# Wait for Jenkins fully started +# Wait for Jenkins to be fully started ynh_systemd_action --action=restart --line_match="Jenkins is fully up and running" --log_path="/var/log/$app/$app.log" --timeout="300" #================================================= diff --git a/scripts/install b/scripts/install index b0ea530..6abd5dc 100644 --- a/scripts/install +++ b/scripts/install @@ -16,14 +16,16 @@ source _variables #================================================= ynh_clean_setup () { -# Nettoyage des résidus d'installation non pris en charge par le script remove. + # Clean installation remaining that are not handle by the remove script. ynh_clean_check_starting - ynh_exec_warn_less kill -s 15 $pid_change_port # Arrête l'exécution de change_port + # Stop change_port() + ynh_exec_warn_less kill -s 15 $pid_change_port # Clean hosts sed -i '/#jenkins/d' /etc/hosts } -ynh_abort_if_errors # Active trap pour arrêter le script si une erreur est détectée. +# Exit if an error occurs during the execution of the script +ynh_abort_if_errors #================================================= # RETRIEVE ARGUMENTS FROM THE MANIFEST @@ -64,7 +66,8 @@ ynh_app_setting_set $app overwrite_nginx "1" # FIND AND OPEN A PORT #================================================= -port=$(ynh_find_port 8080) # Cherche un port libre. +# Find a free port +port=$(ynh_find_port 8080) ynh_app_setting_set $app port $port #================================================= @@ -77,6 +80,7 @@ ynh_install_app_dependencies $app_depencencies # NGINX CONFIGURATION #================================================= +# Create a dedicated nginx config ynh_add_nginx_config #================================================= @@ -101,6 +105,7 @@ pid_change_port=$! # INSTALL JENKINS #================================================= +# Download jenkins deb file and install it. ynh_download_file --dest_dir="../conf" dpkg --install ../conf/jenkins.deb @@ -108,11 +113,12 @@ dpkg --install ../conf/jenkins.deb # SETUP JENKINS #================================================= -# Ignore le Setup Wizard +# Ignore Setup Wizard ynh_replace_string "-Djava.awt.headless=true" "& -Djenkins.install.runSetupWizard=false" /etc/default/jenkins if [ "$path_url" != "/" ]; -then # Ajoute le path en cas d'installation en sous-dossier dans les options de démarrage de Jenkins +then + # Add the path, in case of sub-path installation, into jenkins' boot options sed -i "$ s@--httpPort=\$HTTP_PORT@& --prefix=$path_url@g" /etc/default/jenkins fi @@ -120,14 +126,14 @@ fi # FORCE PUBLIC ACCESS #================================================= -# Jenkins est public par défaut, au moins pour le téléchargement de jenkins-cli.jar +# Jenkins has to be public, at least for jenkins-cli.jar ynh_app_setting_set $app unprotected_uris "/" ynh_systemd_action --action=reload --service_name=nginx yunohost app ssowatconf #================================================= -# ENABLE SERVICE IN ADMIN PANEL +# ADVERTISE SERVICE IN ADMIN PANEL #================================================= yunohost service add $app --log /var/log/$app/$app.log @@ -138,18 +144,19 @@ yunohost service add $app --log /var/log/$app/$app.log config_OK=0 timeout=3600 -echo "127.0.0.1 $domain #jenkins" | tee -a /etc/hosts # Renseigne le domain dans le host, pour prévenir d'un dns pas encore propagé. +# Add the domain to /etc/hosts, to prevent any dns delay +echo "127.0.0.1 $domain #jenkins" | tee -a /etc/hosts jenkins_cli="java -jar /var/lib/jenkins/jenkins-cli.jar -remoting -s http://$domain$path_url" -# Wait for Jenkins fully started +# Wait for Jenkins to be fully started ynh_systemd_action --action=restart --line_match="Jenkins is fully up and running" --log_path="/var/log/$app/$app.log" --timeout="$timeout" - -# Si le log annonce une première fois le démarrage de jenkins. Installe les plugins +# If the log says that jenkins has started, install the plugins wget -nv --no-check-certificate https://$domain$path_url/jnlpJars/jenkins-cli.jar -O /var/lib/jenkins/jenkins-cli.jar for i in `seq 1 $timeout` -do # La boucle attend la mise à jour des dépôts de plugins. +do + # Wait for an update of plugin repositories if test -e /var/lib/jenkins/updates/default.json; then break; else @@ -158,10 +165,10 @@ do # La boucle attend la mise à jour des dépôts de plugins. fi done -# Installation du plugin pour l'authentification ldap et http auth +# Install plugins for http authentication and ldap. $jenkins_cli install-plugin reverse-proxy-auth-plugin -# Installation des plugins recommandés (Lors de l'install avec le Setup Wizard) +# Install recommended plugins (those from Setup Wizard) $jenkins_cli install-plugin cloudbees-folder # Folders Plugin $jenkins_cli install-plugin antisamy-markup-formatter # OWASP Markup Formatter Plugin $jenkins_cli install-plugin pam-auth # PAM Authentication plugin @@ -182,26 +189,29 @@ $jenkins_cli install-plugin subversion # Subversion Plug-in $jenkins_cli install-plugin email-ext # Email Extension Plugin $jenkins_cli install-plugin ssh-slaves # SSH Slaves plugin -# Installation de plugins supplémentaires pour le confort -$jenkins_cli install-plugin ansicolor # Prise en charge des couleurs pour la sortie console. Améliore la lisibilité de la console (par contre les couleurs ne passent pas...) -$jenkins_cli install-plugin fstrigger # Monitoring sur le système de fichier local. Pour surveiller des dossiers de code et builder sur les changements. +# Install extra comfort plugins +# Handle terminal colours. Enhance the readability of the terminal. +$jenkins_cli install-plugin ansicolor +# MOnitoring of the local file system. Allow to monitor a directory and trig a job if a file has been modified. +$jenkins_cli install-plugin fstrigger -# Configure la sécurité globale avec ldap par défaut. +# Set global security with ldap cp ../conf/config.xml /var/lib/jenkins/ chown jenkins: /var/lib/jenkins/config.xml -# Wait for Jenkins fully started +# Wait for Jenkins to be fully started ynh_systemd_action --action=restart --line_match="Jenkins is fully up and running" --log_path="/var/log/$app/$app.log" --timeout="$timeout" #================================================= # SETUP SSOWAT #================================================= -# Si Jenkins est privé, retire l'autorisation publique. if [ $is_public -eq 0 ] -then # Retire l'accès public +then + # Remove the public access ynh_app_setting_delete $app unprotected_uris - ynh_app_setting_set $app skipped_uris "/github-webhook" # /path/github-webhook doit rester accessible pour les webhooks de github. + # /path/github-webhook has to be accessible for github's webhooks + ynh_app_setting_set $app skipped_uris "/github-webhook" fi #================================================= @@ -214,6 +224,6 @@ sed -i '/#jenkins/d' /etc/hosts # SEND A README FOR THE ADMIN #================================================= -message="If you facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/jenkins_ynh" +message="If you're facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/jenkins_ynh" ynh_send_readme_to_admin --app_message="$message" --recipients="root" diff --git a/scripts/remove b/scripts/remove index 5b6ae3b..a66df30 100644 --- a/scripts/remove +++ b/scripts/remove @@ -20,10 +20,11 @@ domain=$(ynh_app_setting_get $app domain) #================================================= # STANDARD REMOVE #================================================= -# DISABLE SERVICE IN ADMIN PANEL +# REMOVE SERVICE FROM ADMIN PANEL #================================================= -if yunohost service status | grep -q $app # Test l'existence du service dans Yunohost +# Check if the service is declared in YunoHost +if yunohost service status | grep -q $app then ynh_print_info "Remove $app service" >&2 yunohost service remove $app @@ -34,6 +35,7 @@ fi #================================================= ynh_apt purge jenkins +# Remove metapackage and its dependencies ynh_remove_app_dependencies ynh_secure_remove "/var/lib/jenkins" @@ -41,4 +43,5 @@ ynh_secure_remove "/var/lib/jenkins" # REMOVE THE NGINX CONFIGURATION #================================================= -ynh_remove_nginx_config # Suppression de la configuration nginx résidus. +# Remove the dedicated nginx config +ynh_remove_nginx_config diff --git a/scripts/restore b/scripts/restore index b033f02..b7ab97d 100644 --- a/scripts/restore +++ b/scripts/restore @@ -16,7 +16,7 @@ source ../settings/scripts/_variables #================================================= ynh_clean_setup () { -# Nettoyage des résidus d'installation non pris en charge par le script remove. + # Clean installation remaining that are not handle by the remove script. ynh_clean_check_starting } # Exit if an error occurs during the execution of the script @@ -51,12 +51,12 @@ ynh_maintenance_mode_ON #================================================= # STANDARD RESTORE STEPS #================================================= -# RESTORE OF THE NGINX CONFIGURATION +# RESTORE THE NGINX CONFIGURATION #================================================= ynh_restore_file "/etc/nginx/conf.d/$domain.d/$app.conf" -# Reload webserver +# Reload nginx ynh_systemd_action --action=reload --service_name=nginx #================================================= @@ -87,24 +87,25 @@ pid_change_port=$! # INSTALL JENKINS #================================================= +# Download jenkins deb file and install it. ynh_download_file --dest_dir="../conf" dpkg --install ../conf/jenkins.deb #================================================= -# RESTORE OF THE MAIN DIR OF THE APP +# RESTORE THE APP MAIN DIR #================================================= ynh_restore_file "$final_path" #================================================= -# RESTORE OF THE JENKINS' BOOT CONFIG +# RESTORE THE JENKINS' BOOT CONFIG #================================================= ynh_secure_remove "/etc/default/jenkins" ynh_restore_file /etc/default/$app #================================================= -# ENABLE SERVICE IN ADMIN PANEL +# ADVERTISE SERVICE IN ADMIN PANEL #================================================= yunohost service add $app --log "/var/log/$app/$app.log" @@ -113,7 +114,7 @@ yunohost service add $app --log "/var/log/$app/$app.log" # CHECK JENKINS STARTING #================================================= -# Wait for Jenkins fully started +# Wait for Jenkins to be fully started ynh_systemd_action --action=restart --line_match="Jenkins is fully up and running" --log_path="/var/log/$app/$app.log" --timeout="$timeout" #================================================= @@ -126,6 +127,6 @@ ynh_maintenance_mode_OFF # SEND A README FOR THE ADMIN #================================================= -message="If you facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/jenkins_ynh" +message="If you're facing an issue or want to improve this app, please open a new issue in this project: https://github.com/YunoHost-Apps/jenkins_ynh" ynh_send_readme_to_admin --app_message="$message" --recipients="root" diff --git a/scripts/upgrade b/scripts/upgrade index f881ec4..9ca9863 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -15,7 +15,6 @@ source _variables # LOAD SETTINGS #================================================= -# Récupère les infos de l'application. app=$YNH_APP_INSTANCE_NAME domain=$(ynh_app_setting_get $app domain) @@ -34,8 +33,9 @@ upgrade_type=$(ynh_check_app_version_changed) # ENSURE DOWNWARD COMPATIBILITY #================================================= +# Fix is_public as a boolean if [ "$is_public" = "Yes" ]; then - ynh_app_setting_set $app is_public 1 # Fixe is_public en booléen + ynh_app_setting_set $app is_public 1 is_public=1 elif [ "$is_public" = "No" ]; then ynh_app_setting_set $app is_public 0 @@ -52,9 +52,10 @@ fi if [ -e "/etc/apt/sources.list.d/jenkins.list" ] then ynh_secure_remove /etc/apt/sources.list.d/jenkins.list - # Récupère l'id de la clé APT de jenkins + # Get APT key id for jenkins apt_key=$(apt-key list | grep -B1 "Kohsuke Kawaguchi" | grep pub | cut -d'/' -f2 | cut -d' ' -f1) - apt-key del $apt_key # Supprime la clé APT + # Delete the APT key + apt-key del $apt_key apt-get update fi @@ -84,6 +85,7 @@ ynh_maintenance_mode_ON if [ "$upgrade_type" == "UPGRADE_APP" ] then + # Download jenkins deb file and install it. ynh_download_file --dest_dir="../conf" dpkg --install ../conf/jenkins.deb @@ -92,7 +94,8 @@ then #================================================= if [ "$path_url" != "/" ]; - then # Ajoute le path en cas d'installation en sous-dossier dans les options de démarrage de Jenkins + then + # Add the path, in case of sub-path installation, into jenkins' boot options if ! grep --quiet "prefix=$path_url" /etc/default/jenkins then sed -i "$ s@--httpPort=\$HTTP_PORT@& --prefix=$path_url@g" /etc/default/jenkins @@ -137,7 +140,7 @@ ynh_system_reload --action=reload --service_name=nginx # CHECK JENKINS STARTING #================================================= -# Wait for Jenkins fully started +# Wait for Jenkins to be fully started ynh_systemd_action --action=restart --line_match="Jenkins is fully up and running" --log_path="/var/log/$app/$app.log" --timeout="$timeout" #=================================================