From d1e644aae0aaaaa63fd6083cf81a16b2833f9c2d Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Fri, 22 Nov 2019 13:40:10 +0100 Subject: [PATCH] remove gitea internal logrotate --- defaults/main.yml | 11 +++++++---- templates/custom/conf/app.ini.j2 | 6 +----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 172208c..b102989 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,5 +1,5 @@ --- -gitea_version: 1.9.0 +gitea_version: 1.10.0 gitea_user: "gitea_adm" gitea_user_home: "/home/{{ gitea_user }}" gitea_group: "{{ gitea_user }}" @@ -13,6 +13,12 @@ gitea_bin_dir: "{{ gitea_base_dir }}/bin" gitea_config_dir: "{{ gitea_base_dir }}/custom/conf" gitea_data_dir: "{{ gitea_base_dir }}/data" +gitea_selinux_fcontext: + - target: "{{ gitea_global_log_dir }}(/.*)?" + setype: var_log_t +gitea_selinux_restorecon: + - "-ir {{ gitea_global_log_dir }}" + gitea_bind_ip: 127.0.0.1 gitea_bind_port: 61000 gitea_listen_address: http://gitea.example.com @@ -38,9 +44,6 @@ gitea_db_ssl_mode: disable gitea_global_log_level: Info gitea_global_log_dir: "{{ gitea_base_dir }}/log" gitea_file_log_level: "{{ gitea_global_log_level }}" -gitea_file_log_rotate_enabled: "true" -gitea_file_log_rotate_daily_enabled: "true" -gitea_file_log_rotate_max_days: 7 gitea_repository_upload_max_filesize: 3 gitea_repository_upload_max_files: 5 diff --git a/templates/custom/conf/app.ini.j2 b/templates/custom/conf/app.ini.j2 index f57541e..03bbbbd 100644 --- a/templates/custom/conf/app.ini.j2 +++ b/templates/custom/conf/app.ini.j2 @@ -180,11 +180,7 @@ ENABLE_ACCESS_LOG = true [log.file] LEVEL = {{ gitea_file_log_level }} -LOG_ROTATE = {{ gitea_file_log_rotate_enabled }} -MAX_LINES = 1000000 -MAX_SIZE_SHIFT = 28 -DAILY_ROTATE = {{ gitea_file_log_rotate_daily_enabled }} -MAX_DAYS = {{ gitea_file_log_rotate_max_days }} +LOG_ROTATE = false [cron] ENABLED = true