diff --git a/README.md b/README.md index 7acf94f..dbefa27 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Piwigo for YunoHost Extensions make Piwigo easily customizable. Icing on the cake, Piwigo is free and opensource. -**Shipped version:** 2.9.2 +**Shipped version:** 2.9.3 ![](http://piwigo.org/screenshots/homepage/piwigo-batch-manager.png) diff --git a/check_process b/check_process index 35a7b18..3e14e66 100644 --- a/check_process +++ b/check_process @@ -13,6 +13,7 @@ setup_private=1 setup_public=1 upgrade=1 + upgrade=1 from_commit=f7a6d6ca2dbbd39f20d299478c28f92e83f6f53c backup_restore=1 multi_instance=1 incorrect_path=1 @@ -33,4 +34,8 @@ Level 10=0 ;;; Options Email= -Notification=none \ No newline at end of file +Notification=none +;;; Upgrade options + ; commit=f7a6d6ca2dbbd39f20d299478c28f92e83f6f53c + name=Take more official review comments into account + manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1& diff --git a/conf/app.src b/conf/app.src index 1a5b754..6e2da07 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,4 +1,3 @@ -SOURCE_URL=http://piwigo.org/download/dlcounter.php?code=2.9.2 -SOURCE_SUM=344937dd1685efb41c1aa7301497aea0fb84707a6a9809eca9efb390d4eadb4a +SOURCE_URL=http://piwigo.org/download/dlcounter.php?code=2.9.3 +SOURCE_SUM=4022a743ddc0555f8d4f114ec3c3aa439eec44659cbf0d1564d0e3cc2ff30426 SOURCE_FORMAT=zip - diff --git a/manifest.json b/manifest.json index 1ced49b..f5d8366 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "photo gallery", "fr": "Galerie photo" }, - "version": "2.9.2-2", + "version": "2.9.3~ynh1", "url": "http://piwigo.org", "license": "GPL-2.0", "maintainer": { diff --git a/scripts/_common.sh b/scripts/_common.sh index 49a8a60..2eed000 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -24,41 +24,47 @@ ynh_add_fail2ban_config () { test -n "$logpath" || ynh_die "ynh_add_fail2ban_config expects a logfile path as first argument and received nothing." test -n "$failregex" || ynh_die "ynh_add_fail2ban_config expects a failure regex as second argument and received nothing." - finalfail2banjailconf="/etc/fail2ban/jail.d/$app.conf" - finalfail2banfilterconf="/etc/fail2ban/filter.d/$app.conf" - ynh_backup_if_checksum_is_different "$finalfail2banjailconf" 1 - ynh_backup_if_checksum_is_different "$finalfail2banfilterconf" 1 + finalfail2banjailconf="/etc/fail2ban/jail.d/$app.conf" + finalfail2banfilterconf="/etc/fail2ban/filter.d/$app.conf" + ynh_backup_if_checksum_is_different "$finalfail2banjailconf" 1 + ynh_backup_if_checksum_is_different "$finalfail2banfilterconf" 1 - cat > $finalfail2banjailconf < $finalfail2banfilterconf <&2 + echo "WARNING${fail2ban_error#*WARNING}" >&2 + fi } # Remove the dedicated fail2ban config (jail and filter conf files) # # usage: 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" - systemctl restart fail2ban + sudo systemctl restart fail2ban } # Delete a file checksum from the app settings diff --git a/scripts/restore b/scripts/restore index 9fe54a6..c0b8fe2 100644 --- a/scripts/restore +++ b/scripts/restore @@ -91,6 +91,10 @@ chown -R $app: /home/yunohost.app/${app} #================================================= ynh_restore_file "/etc/fail2ban/jail.d/$app.conf" ynh_restore_file "/etc/fail2ban/filter.d/$app.conf" + +touch "/var/log/${app}FailedLogins.log" +chown $app: "/var/log/${app}FailedLogins.log" + systemctl restart fail2ban #=================================================