Use ynh_systemd_action

This commit is contained in:
Maniack Crudelis 2019-04-13 17:42:47 +02:00
parent ec48edfef8
commit ebb32f0d9c
2 changed files with 5 additions and 4 deletions

View file

@ -442,7 +442,7 @@ EOF
ynh_store_file_checksum "$finalfail2banjailconf" ynh_store_file_checksum "$finalfail2banjailconf"
ynh_store_file_checksum "$finalfail2banfilterconf" ynh_store_file_checksum "$finalfail2banfilterconf"
systemctl try-reload-or-restart fail2ban ynh_systemd_action --service_name=fail2ban --action=reload
local fail2ban_error="$(journalctl -u fail2ban | tail -n50 | grep "WARNING.*$app.*")" local fail2ban_error="$(journalctl -u fail2ban | tail -n50 | grep "WARNING.*$app.*")"
if [[ -n "$fail2ban_error" ]]; then if [[ -n "$fail2ban_error" ]]; then
@ -459,5 +459,5 @@ EOF
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"
systemctl try-reload-or-restart fail2ban ynh_systemd_action --service_name=fail2ban --action=reload
} }

View file

@ -276,7 +276,8 @@ ynh_psql_test_if_first_run() {
ynh_die "postgresql shoud be 9.4 or 9.6" ynh_die "postgresql shoud be 9.4 or 9.6"
fi fi
systemctl start postgresql ynh_systemd_action --service_name=postgresql --action=start
sudo --login --user=postgres psql -c"ALTER user postgres WITH PASSWORD '$pgsql'" postgres sudo --login --user=postgres psql -c"ALTER user postgres WITH PASSWORD '$pgsql'" postgres
# force all user to connect to local database using passwords # force all user to connect to local database using passwords
@ -289,6 +290,6 @@ ynh_psql_test_if_first_run() {
yunohost service add postgresql --log "$logfile" yunohost service add postgresql --log "$logfile"
systemctl enable postgresql systemctl enable postgresql
systemctl reload postgresql ynh_systemd_action --service_name=postgresql --action=reload
fi fi
} }