YunoHost-Apps/piwigo_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/piwigo_ynh.git synced 2024-09-03 20:06:03 +02:00
Code Issues Activity Actions 1

Simplify helper

Browse source
This commit is contained in:
Jimmy Monin 2017-06-18 15:43:34 +02:00
parent d1ab68a08f
commit aa2407f723
1 changed files with 8 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
scripts/_common.sh
View file

@ -597,42 +597,18 @@ ynh_add_fail2ban_config () {
ynh_backup_if_checksum_is_different "$finalfail2banjailconf" 1 ynh_backup_if_checksum_is_different "$finalfail2banjailconf" 1
ynh_backup_if_checksum_is_different "$finalfail2banfilterconf" 1 ynh_backup_if_checksum_is_different "$finalfail2banfilterconf" 1
cat > ./jaild.conf << EOF echo "[$app]
[__NAME__]
enabled = true enabled = true
port = __PORTS__ port = $ports
filter = __NAME__ filter = $app
logpath = __LOGPATH__ logpath = $logpath
maxretry = __MAXRETRY__ maxretry = $max_retry" | sudo tee $finalfail2banjailconf
EOF
cat > ./filterd.conf << EOF echo "[INCLUDES]
[INCLUDES]
before = common.conf before = common.conf
[Definition] [Definition]
failregex = __FAILREGEX__ failregex = $failregex
ignoreregrex = ignoreregrex =" | sudo tee $finalfail2banfilterconf
EOF
sudo mv ./jaild.conf $finalfail2banjailconf
sudo mv ./filterd.conf $finalfail2banfilterconf
# To avoid a break by set -u, use a void substitution ${var:-}. If the variable is not set, it's simply set with an empty variable.
# Substitute in config file only if the variable is not empty
# jail configuration file
if test -n "${app:-}"; then
ynh_replace_string "__NAME__" "$app" "$finalfail2banjailconf"
fi
if test -n "${logpath:-}"; then
ynh_replace_string "__LOGPATH__" "$logpath" "$finalfail2banjailconf"
fi
ynh_replace_string "__PORTS__" "$ports" "$finalfail2banjailconf"
ynh_replace_string "__MAXRETRY__" "$max_retry" "$finalfail2banjailconf"
# filter configuration file
if test -n "${failregex:-}"; then
ynh_replace_string "__FAILREGEX__" "$failregex" "$finalfail2banfilterconf"
fi
ynh_store_file_checksum "$finalfail2banjailconf" ynh_store_file_checksum "$finalfail2banjailconf"
ynh_store_file_checksum "$finalfail2banfilterconf" ynh_store_file_checksum "$finalfail2banfilterconf"