1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/jenkins_ynh.git synced 2024-09-03 19:26:18 +02:00

Merge pull request #14 from YunoHost-Apps/testing

Fix upgrade from
This commit is contained in:
Maniack Crudelis 2018-01-04 19:43:38 +01:00 committed by GitHub
commit 06a9083c9a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 3 deletions

View file

@ -11,7 +11,7 @@
setup_private=1 setup_private=1
setup_public=1 setup_public=1
upgrade=1 upgrade=1
upgrade=1 from_commit=a8a843c80846eced71edb4f62f4b2981578751e2 upgrade=1 from_commit=a1211123350ae50675d4f37074d2953939e55dff
backup_restore=1 backup_restore=1
multi_instance=0 multi_instance=0
incorrect_path=1 incorrect_path=1
@ -34,6 +34,6 @@
Email= Email=
Notification=down Notification=down
;;; Upgrade options ;;; Upgrade options
; commit=a8a843c80846eced71edb4f62f4b2981578751e2 ; commit=a1211123350ae50675d4f37074d2953939e55dff
name=5 Sep 2017 a8a843c80846eced71edb4f62f4b2981578751e2 name=21 Dec 2017 a1211123350ae50675d4f37074d2953939e55dff
manifest_arg=domain=DOMAIN&path=PATH&is_public=1& manifest_arg=domain=DOMAIN&path=PATH&is_public=1&

View file

@ -454,6 +454,11 @@ EOF
ynh_store_file_checksum "$finalfail2banfilterconf" ynh_store_file_checksum "$finalfail2banfilterconf"
sudo systemctl restart fail2ban sudo systemctl restart fail2ban
if local fail2ban_error="$(tail -n50 /var/log/fail2ban.log | grep "WARNING Command.*$app.*addfailregex")"
then
echo "[ERR] Fail2ban fail to load the jail for $app" >&2
echo "WARNING${fail2ban_error#*WARNING}" >&2
fi
} }
# Remove the dedicated fail2ban config (jail and filter conf files) # Remove the dedicated fail2ban config (jail and filter conf files)

View file

@ -35,6 +35,7 @@ fi
ynh_apt purge jenkins ynh_apt purge jenkins
ynh_remove_app_dependencies ynh_remove_app_dependencies
ynh_secure_remove "/var/lib/jenkins"
#================================================= #=================================================
# REMOVE THE NGINX CONFIGURATION # REMOVE THE NGINX CONFIGURATION