From 9e2c149643a55a8215ab91ebca498050304a94cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Mon, 5 Aug 2019 16:51:46 +0200
Subject: [PATCH] Change the log managment (also for fail2ban support)

---
 conf/app.ini       | 25 ++++++++++++++++++++++++-
 scripts/change_url |  2 +-
 scripts/install    |  2 +-
 scripts/restore    |  2 +-
 scripts/upgrade    |  2 +-
 5 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/conf/app.ini b/conf/app.ini
index e06c763..9d2f924 100644
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -2,6 +2,7 @@
 APP_NAME = Gitea
 RUN_USER = __APP__
 RUN_MODE = prod
+
 [database]
 DB_TYPE = mysql
 HOST = 127.0.0.1:3306
@@ -10,9 +11,12 @@ USER = __DB_USER__
 PASSWD = __DB_PASSWORD__
 SSL_MODE = disable
 PATH     = data/gitea.db
+LOG_SQL  = false
+
 [repository]
 ROOT = __REPOS_PATH__
 FORCE_PRIVATE = false
+
 [server]
 DOMAIN       = __DOMAIN__
 HTTP_PORT    = __PORT__
@@ -22,11 +26,13 @@ SSH_PORT     = __SSH_PORT_
 OFFLINE_MODE = false
 APP_DATA_PATH = __DATA_PATH__
 LANDING_PAGE = explore
+
 [mailer]
 ENABLED = true
 HOST = 127.0.0.1:25
 FROM = "Gitea" <gitea-noreply@__DOMAIN__>
 SKIP_VERIFY = true
+
 [service]
 REGISTER_EMAIL_CONFIRM = false
 ENABLE_NOTIFY_MAIL     = true
@@ -35,16 +41,33 @@ ENABLE_CAPTCHA         = false
 REQUIRE_SIGNIN_VIEW    = false
 ENABLE_REVERSE_PROXY_AUTHENTICATION = false
 ENABLE_REVERSE_PROXY_AUTO_REGISTERATION = false
+
 [picture]
 AVATAR_UPLOAD_PATH = __DATA_PATH__/avatars
+
 [attachment]
 PATH = __DATA_PATH__/attachments
+
 [session]
 PROVIDER = memory
+
 [log]
 MODE      = file
-LEVEL     = Warn
+LEVEL     = Info
 ROOT_PATH = /var/log/__APP__
+
+REDIRECT_MACARON_LOG= true
+MACARON             = file
+
+ROUTER_LOG_LEVEL    = Warn
+ROUTER              = file
+
+ENABLE_ACCESS_LOG   = Warn
+ACCESS              = file
+
+ENABLE_XORM_LOG     = Warn
+XORM                = file
+
 [security]
 INSTALL_LOCK = true
 SECRET_KEY   = __KEY__
diff --git a/scripts/change_url b/scripts/change_url
index 6486964..cba3629 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -51,7 +51,7 @@ config_nginx
 config_gitea
 
 # RELOAD services
-ynh_systemd_action -l "Gitea v$upstream_version built with GNU Make .*, go.* : bindata, sqlite, sqlite_unlock_notify" -p "systemd" -a restart -t 5
+ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "/var/log/$app/gitea.log" -a restart
 sleep 1
 
 # Store the checksum with the 'INTERNAL_TOKEN' value.
diff --git a/scripts/install b/scripts/install
index 3e6d8f1..ebcf97e 100644
--- a/scripts/install
+++ b/scripts/install
@@ -117,7 +117,7 @@ ynh_use_logrotate "/var/log/$app"
 ynh_app_setting_set $app upstream_version $upstream_version
 
 # Reload services
-ynh_systemd_action -l "Gitea v$upstream_version built with GNU Make .*, go.* : bindata, sqlite, sqlite_unlock_notify" -p "systemd" -t 5
+ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "/var/log/$app/gitea.log"
 sleep 1
 
 # Store the checksum with the 'INTERNAL_TOKEN' value.
diff --git a/scripts/restore b/scripts/restore
index 8abb1d1..7bc7e3a 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -70,5 +70,5 @@ yunohost service add "$app" --log /var/log/"$app"/"$app".log
 
 # Reload services
 systemctl reload nginx.service
-ynh_systemd_action -l "Gitea v$upstream_version built with GNU Make .*, go.* : bindata, sqlite, sqlite_unlock_notify" -p "systemd" -t 5
+ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "/var/log/$app/gitea.log"
 sleep 1
diff --git a/scripts/upgrade b/scripts/upgrade
index 07ec290..e112428 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -178,7 +178,7 @@ ynh_app_setting_set $app upstream_version $(ynh_app_upstream_version)
 set_access_settings
 
 # Reload services
-ynh_systemd_action -l "Gitea v$upstream_version built with GNU Make .*, go.* : bindata, sqlite, sqlite_unlock_notify" -p "systemd" -t 5
+ynh_systemd_action -l "Serving \[::\]:$port with pid" -p "/var/log/$app/gitea.log"
 sleep 1
 
 # Store the checksum with the 'INTERNAL_TOKEN' value.