YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #725 from YunoHost/helper_min_version

Browse source 
Set min version to 3.5.0 for helpers
This commit is contained in:
Alexandre Aubin 2019-05-18 17:04:09 +02:00 • committed by GitHub
commit 5f7cde4c6b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/helpers.d/fail2ban
View file

@ -61,7 +61,7 @@
# To validate your regex you can test with this command: # To validate your regex you can test with this command:
# fail2ban-regex /var/log/YOUR_LOG_FILE_PATH /etc/fail2ban/filter.d/YOUR_APP.conf # fail2ban-regex /var/log/YOUR_LOG_FILE_PATH /etc/fail2ban/filter.d/YOUR_APP.conf
# #
# Requires YunoHost version 3.?.? or higher. # Requires YunoHost version 3.5.0 or higher.
ynh_add_fail2ban_config () { ynh_add_fail2ban_config () {
# Declare an array to define the options of this helper. # Declare an array to define the options of this helper.
local legacy_args=lrmptv local legacy_args=lrmptv
@ -143,7 +143,7 @@ EOF
# #
# usage: ynh_remove_fail2ban_config # usage: ynh_remove_fail2ban_config
# #
# Requires YunoHost version 3.?.? or higher. # Requires YunoHost version 3.5.0 or higher.
ynh_remove_fail2ban_config () { ynh_remove_fail2ban_config () {
ynh_secure_remove "/etc/fail2ban/jail.d/$app.conf" ynh_secure_remove "/etc/fail2ban/jail.d/$app.conf"
ynh_secure_remove "/etc/fail2ban/filter.d/$app.conf" ynh_secure_remove "/etc/fail2ban/filter.d/$app.conf"

6
data/helpers.d/logging
View file

@ -195,7 +195,7 @@ ynh_print_ON () {
# The execution time is given for the duration since the previous call. So the weight should be applied to this previous call. # The execution time is given for the duration since the previous call. So the weight should be applied to this previous call.
# | arg: -l, --last= - Use for the last call of the helper, to fill te progression bar. # | arg: -l, --last= - Use for the last call of the helper, to fill te progression bar.
# #
# Requires YunoHost version 3.?.? or higher. # Requires YunoHost version 3.5.0 or higher.
increment_progression=0 increment_progression=0
previous_weight=0 previous_weight=0
# Define base_time when the file is sourced # Define base_time when the file is sourced
@ -284,7 +284,7 @@ ynh_script_progression () {
# | arg: -m, --message= - The text to print # | arg: -m, --message= - The text to print
# | arg: -t, --trace= - Turn on or off the trace of the script. Usefull to trace nonly a small part of a script. # | arg: -t, --trace= - Turn on or off the trace of the script. Usefull to trace nonly a small part of a script.
# #
# Requires YunoHost version 3.?.? or higher. # Requires YunoHost version 3.5.0 or higher.
ynh_debug () { ynh_debug () {
# Disable set xtrace for the helper itself, to not pollute the debug log # Disable set xtrace for the helper itself, to not pollute the debug log
set +x set +x
@ -339,7 +339,7 @@ ynh_debug () {
# #
# | arg: command - command to execute # | arg: command - command to execute
# #
# Requires YunoHost version 3.?.? or higher. # Requires YunoHost version 3.5.0 or higher.
ynh_debug_exec () { ynh_debug_exec () {
ynh_debug --message="$(eval $@)" ynh_debug --message="$(eval $@)"
} }

16
data/helpers.d/postgresql
View file

@ -12,7 +12,7 @@ PSQL_ROOT_PWD_FILE=/etc/yunohost/psql
# | arg: -p, --password - the user password # | arg: -p, --password - the user password
# | arg: -d, --database - the database to connect to # | arg: -d, --database - the database to connect to
# #
# Requires YunoHost version 3.?.? or higher. # Requires YunoHost version 3.5.0 or higher.
ynh_psql_connect_as() { ynh_psql_connect_as() {
# Declare an array to define the options of this helper. # Declare an array to define the options of this helper.
local legacy_args=upd local legacy_args=upd
@ -33,7 +33,7 @@ ynh_psql_connect_as() {
# | arg: -s, --sql - the SQL command to execute # | arg: -s, --sql - the SQL command to execute
# | arg: -d, --database - the database to connect to # | arg: -d, --database - the database to connect to
# #
# Requires YunoHost version 3.?.? or higher. # Requires YunoHost version 3.5.0 or higher.
ynh_psql_execute_as_root() { ynh_psql_execute_as_root() {
# Declare an array to define the options of this helper. # Declare an array to define the options of this helper.
local legacy_args=sd local legacy_args=sd
@ -54,7 +54,7 @@ ynh_psql_execute_as_root() {
# | arg: -f, --file - the file containing SQL commands # | arg: -f, --file - the file containing SQL commands
# | arg: -d, --database - the database to connect to # | arg: -d, --database - the database to connect to
# #
# Requires YunoHost version 3.?.? or higher. # Requires YunoHost version 3.5.0 or higher.
ynh_psql_execute_file_as_root() { ynh_psql_execute_file_as_root() {
# Declare an array to define the options of this helper. # Declare an array to define the options of this helper.
local legacy_args=fd local legacy_args=fd
@ -77,7 +77,7 @@ ynh_psql_execute_file_as_root() {
# | arg: db - the database name to create # | arg: db - the database name to create
# | arg: user - the user to grant privilegies # | arg: user - the user to grant privilegies
# #
# Requires YunoHost version 3.?.? or higher. # Requires YunoHost version 3.5.0 or higher.
ynh_psql_create_db() { ynh_psql_create_db() {
local db=$1 local db=$1
local user=${2:-} local user=${2:-}
@ -102,7 +102,7 @@ ynh_psql_create_db() {
# usage: ynh_psql_drop_db db # usage: ynh_psql_drop_db db
# | arg: db - the database name to drop # | arg: db - the database name to drop
# #
# Requires YunoHost version 3.?.? or higher. # Requires YunoHost version 3.5.0 or higher.
ynh_psql_drop_db() { ynh_psql_drop_db() {
local db=$1 local db=$1
# First, force disconnection of all clients connected to the database # First, force disconnection of all clients connected to the database
@ -120,7 +120,7 @@ ynh_psql_drop_db() {
# | arg: -d, --database - the database name to dump # | arg: -d, --database - the database name to dump
# | ret: the psqldump output # | ret: the psqldump output
# #
# Requires YunoHost version 3.?.? or higher. # Requires YunoHost version 3.5.0 or higher.
ynh_psql_dump_db() { ynh_psql_dump_db() {
# Declare an array to define the options of this helper. # Declare an array to define the options of this helper.
local legacy_args=d local legacy_args=d
@ -140,7 +140,7 @@ ynh_psql_dump_db() {
# | arg: user - the user name to create # | arg: user - the user name to create
# | arg: pwd - the password to identify user by # | arg: pwd - the password to identify user by
# #
# Requires YunoHost version 3.?.? or higher. # Requires YunoHost version 3.5.0 or higher.
ynh_psql_create_user() { ynh_psql_create_user() {
local user=$1 local user=$1
local pwd=$2 local pwd=$2
@ -192,7 +192,7 @@ ynh_psql_database_exists() {
# usage: ynh_psql_drop_user user # usage: ynh_psql_drop_user user
# | arg: user - the user name to drop # | arg: user - the user name to drop
# #
# Requires YunoHost version 3.?.? or higher. # Requires YunoHost version 3.5.0 or higher.
ynh_psql_drop_user() { ynh_psql_drop_user() {
ynh_psql_execute_as_root --sql="DROP USER ${1};" ynh_psql_execute_as_root --sql="DROP USER ${1};"
} }

8
data/helpers.d/utils
View file

@ -365,7 +365,7 @@ ynh_get_plain_key() {
# | arg: -m, --manifest= - Path of the manifest to read # | arg: -m, --manifest= - Path of the manifest to read
# | arg: -k, --key= - Name of the key to find # | arg: -k, --key= - Name of the key to find
# #
# Requires YunoHost version 3.?.? or higher. # Requires YunoHost version 3.5.0 or higher.
ynh_read_manifest () { ynh_read_manifest () {
# Declare an array to define the options of this helper. # Declare an array to define the options of this helper.
local legacy_args=mk local legacy_args=mk
@ -392,7 +392,7 @@ ynh_read_manifest () {
# usage: ynh_app_upstream_version [-m manifest] # usage: ynh_app_upstream_version [-m manifest]
# | arg: -m, --manifest= - Path of the manifest to read # | arg: -m, --manifest= - Path of the manifest to read
# #
# Requires YunoHost version 3.?.? or higher. # Requires YunoHost version 3.5.0 or higher.
ynh_app_upstream_version () { ynh_app_upstream_version () {
# Declare an array to define the options of this helper. # Declare an array to define the options of this helper.
local legacy_args=m local legacy_args=m
@ -415,7 +415,7 @@ ynh_app_upstream_version () {
# usage: ynh_app_package_version [-m manifest] # usage: ynh_app_package_version [-m manifest]
# | arg: -m, --manifest= - Path of the manifest to read # | arg: -m, --manifest= - Path of the manifest to read
# #
# Requires YunoHost version 3.?.? or higher. # Requires YunoHost version 3.5.0 or higher.
ynh_app_package_version () { ynh_app_package_version () {
# Declare an array to define the options of this helper. # Declare an array to define the options of this helper.
local legacy_args=m local legacy_args=m
@ -444,7 +444,7 @@ ynh_app_package_version () {
# #
# usage: ynh_check_app_version_changed # usage: ynh_check_app_version_changed
# #
# Requires YunoHost version 3.?.? or higher. # Requires YunoHost version 3.5.0 or higher.
ynh_check_app_version_changed () { ynh_check_app_version_changed () {
local force_upgrade=${YNH_FORCE_UPGRADE:-0} local force_upgrade=${YNH_FORCE_UPGRADE:-0}
local package_check=${PACKAGE_CHECK_EXEC:-0} local package_check=${PACKAGE_CHECK_EXEC:-0}