From 09d981133048498900655e071560ffe22a1d20eb Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 18 Nov 2023 11:15:25 +0100 Subject: [PATCH] cleaning --- doc/ADMIN.md | 3 --- doc/ADMIN_fr.md | 3 --- doc/DESCRIPTION.md | 2 +- doc/DESCRIPTION_fr.md | 2 +- manifest.toml | 19 +++---------------- scripts/change_url | 6 ------ scripts/install | 32 -------------------------------- scripts/remove | 2 -- scripts/upgrade | 25 ------------------------- 9 files changed, 5 insertions(+), 89 deletions(-) delete mode 100644 doc/ADMIN.md delete mode 100644 doc/ADMIN_fr.md diff --git a/doc/ADMIN.md b/doc/ADMIN.md deleted file mode 100644 index c9b5225..0000000 --- a/doc/ADMIN.md +++ /dev/null @@ -1,3 +0,0 @@ -This is a dummy admin doc for this app - -The app install dir is `__INSTALL_DIR__` diff --git a/doc/ADMIN_fr.md b/doc/ADMIN_fr.md deleted file mode 100644 index a138028..0000000 --- a/doc/ADMIN_fr.md +++ /dev/null @@ -1,3 +0,0 @@ -Ceci est une fausse doc d'admin pour cette app - -Le dossier d'install de l'app est `__INSTALL_DIR__` diff --git a/doc/DESCRIPTION.md b/doc/DESCRIPTION.md index 3f2e57a..7751598 100644 --- a/doc/DESCRIPTION.md +++ b/doc/DESCRIPTION.md @@ -1 +1 @@ -This is a dummy description of this app features +Woodpecker is a simple CI engine with great extensibility. diff --git a/doc/DESCRIPTION_fr.md b/doc/DESCRIPTION_fr.md index 13f4b64..be82c0a 100644 --- a/doc/DESCRIPTION_fr.md +++ b/doc/DESCRIPTION_fr.md @@ -1 +1 @@ -Ceci est une fausse description des fonctionalités de l'app +Woodpecker est un moteur CI simple avec une grande extensibilité. diff --git a/manifest.toml b/manifest.toml index 3c6c25c..c5a036b 100644 --- a/manifest.toml +++ b/manifest.toml @@ -4,8 +4,8 @@ packaging_format = 2 id = "woodpecker" name = "Woodpecker" -description.en = "CI engine with great extensibility integrated with Github, Gitlab, Gitea, etc." -description.fr = "Un outil d'intégration continue extensible intégrable avec Github, Gitlab, Gitea etc." +description.en = "CI engine with great extensibility integrated with GitHub, GitLab, Gitea..." +description.fr = "Outil d'intégration continue extensible intégrable avec GitHub, GitLab, Gitea..." version = "1.0.5~ynh1" @@ -22,7 +22,7 @@ cpe = "cpe:2.3:a:woodpecker-ci:woodpecker" fund = "https://opencollective.com/woodpecker-ci" [integration] -yunohost = ">= 11.1.21" +yunohost = ">= 11.2" architectures = ["amd64", "arm64"] multi_instance = true @@ -75,23 +75,10 @@ ram.runtime = "200M" type = "string" default = "" - # [install.admin] - # type = "user" - - # [install.password] - # # this is a generic question - ask strings are automatically handled by YunoHost's core - # # Note that user-provided passwords questions are not automatically saved as setting - # help.en = "Use the help field to add an information for the admin about this question." - # help.fr = "Utilisez le champ aide pour ajouter une information à l'intention de l'administrateur à propos de cette question." - # type = "password" - [resources] [resources.sources] [resources.sources.main] - # This will pre-fetch the asset which can then be deployed during the install/upgrade scripts with : - # ynh_setup_source --dest_dir="$install_dir" - # You can also define other assets than "main" and add --source_id="foobar" in the previous command amd64.url = "https://github.com/woodpecker-ci/woodpecker/releases/download/v1.0.5/woodpecker-server_linux_amd64.tar.gz" amd64.sha256 = "99ccffae1795b561d72850400383771ccf105a8fee8c74e524654d26262420ef" diff --git a/scripts/change_url b/scripts/change_url index f0964a6..ae914ad 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -25,12 +25,6 @@ ynh_script_progression --message="Updating NGINX web server configuration..." -- ynh_change_url_nginx_config -#================================================= -# SPECIFIC MODIFICATIONS -#================================================= -# ... -#================================================= - #================================================= # GENERIC FINALISATION #================================================= diff --git a/scripts/install b/scripts/install index 68eb8c4..9038e75 100755 --- a/scripts/install +++ b/scripts/install @@ -32,30 +32,6 @@ ynh_add_systemd_config yunohost service add "$app" --description="Woodpecker CI server" --log="/var/log/$app/$app.log" -### Additional options starting with 3.8: -### -### --needs_exposed_ports "$port" a list of ports that needs to be publicly exposed -### which will then be checked by YunoHost's diagnosis system -### (N.B. DO NOT USE THIS if the port is only internal!!!) -### -### --test_status "some command" a custom command to check the status of the service -### (only relevant if 'systemctl status' doesn't do a good job) -### -### --test_conf "some command" some command similar to "nginx -t" that validates the conf of the service -### -### Re-calling 'yunohost service add' during the upgrade script is the right way -### to proceed if you later realize that you need to enable some flags that -### weren't enabled on old installs (be careful it'll override the existing -### service though so you should re-provide all relevant flags when doing so) - -### `ynh_use_logrotate` is used to configure a logrotate configuration for the logs of this app. -### Use this helper only if there is effectively a log file for this app. -### If you're not using this helper: -### - Remove the section "BACKUP LOGROTATE" in the backup script -### - Remove also the section "REMOVE LOGROTATE CONFIGURATION" in the remove script -### - As well as the section "RESTORE THE LOGROTATE CONFIGURATION" in the restore script -### - And the section "SETUP LOGROTATE" in the upgrade script - # Create log file before logrotate mkdir -p "/var/log/$app" touch "/var/log/$app/$app.log" @@ -89,14 +65,6 @@ chown "$app:$app" "$install_dir/woodpecker-server.conf" #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=1 -### `ynh_systemd_action` is used to start a systemd service for an app. -### Only needed if you have configure a systemd service -### If you're not using these lines: -### - Remove the section "STOP SYSTEMD SERVICE" and "START SYSTEMD SERVICE" in the backup script -### - As well as the section "START SYSTEMD SERVICE" in the restore script -### - As well as the section"STOP SYSTEMD SERVICE" and "START SYSTEMD SERVICE" in the upgrade script -### - And the section "STOP SYSTEMD SERVICE" and "START SYSTEMD SERVICE" in the change_url script - # Start a systemd service ynh_systemd_action --service_name="$app" --action="start" --log_path="/var/log/$app/$app.log" diff --git a/scripts/remove b/scripts/remove index 05b7974..a3af21a 100755 --- a/scripts/remove +++ b/scripts/remove @@ -16,8 +16,6 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 -# This should be a symetric version of what happens in the install script - # Remove the service from the list of services known by YunoHost (added from `yunohost service add`) if ynh_exec_warn_less yunohost service status "$app" >/dev/null then diff --git a/scripts/upgrade b/scripts/upgrade index fa0b748..8cf0996 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -11,31 +11,6 @@ source /usr/share/yunohost/helpers upgrade_type=$(ynh_check_app_version_changed) -#================================================= -# STANDARD UPGRADE STEPS -#================================================= -# ENSURE DOWNWARD COMPATIBILITY -#================================================= -#ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 - -# -# N.B. : the following setting migration snippets are provided as *EXAMPLES* -# of what you may want to do in some cases (e.g. a setting was not defined on -# some legacy installs and you therefore want to initiaze stuff during upgrade) -# - -# If db_name doesn't exist, create it -#if [ -z "$db_name" ]; then -# db_name=$(ynh_sanitize_dbid --db_name=$app) -# ynh_app_setting_set --app=$app --key=db_name --value=$db_name -#fi - -# If install_dir doesn't exist, create it -#if [ -z "$install_dir" ]; then -# install_dir=/var/www/$app -# ynh_app_setting_set --app=$app --key=install_dir --value=$install_dir -#fi - #================================================= # STOP SYSTEMD SERVICE #=================================================