diff --git a/defaults/main.yml b/defaults/main.yml index 06df01f..abb7653 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -223,8 +223,8 @@ gitea_attachment_allowed_types: gitea_attachment_max_filesize: 3 gitea_attachment_max_files: 5 -gitea_mirror_default_interval: 8h -gitea_mirror_min_interval: 10h +gitea_mirror_default_interval: 10h +gitea_mirror_min_interval: 8h gitea_mail_service_enabled: False gitea_mail_service_from: '"System" ' diff --git a/templates/custom/conf/app.ini.j2 b/templates/custom/conf/app.ini.j2 index fb67090..712efeb 100644 --- a/templates/custom/conf/app.ini.j2 +++ b/templates/custom/conf/app.ini.j2 @@ -1,9 +1,9 @@ #jinja2: lstrip_blocks: True {{ ansible_managed | comment(decoration="; ")}} - APP_NAME = Gitea: Git with a cup of tea RUN_USER = {{ gitea_user }} RUN_MODE = {{ gitea_run_mode }} +WORK_PATH = {{ gitea_base_dir }} [repository] ROOT = {{ gitea_data_dir }}/repos @@ -121,10 +121,12 @@ SQLITE_TIMEOUT = 500 [indexer] ISSUE_INDEXER_TYPE = bleve ISSUE_INDEXER_PATH = {{ gitea_data_dir }}/indexers/issues.bleve -ISSUE_INDEXER_QUEUE_DIR = {{ gitea_data_dir }}/issues.queue REPO_INDEXER_ENABLED = true REPO_INDEXER_PATH = {{ gitea_data_dir }}/indexers/repos.bleve +[queue.issue_indexer] +DATADIR = {{ gitea_data_dir }}/issues.queue + [admin] DISABLE_REGULAR_ORG_CREATION = {{ 'false' if gitea_org_creation_enabled | bool else 'true' }} DEFAULT_EMAIL_NOTIFICATIONS = {{ gitea_default_email_notification }} @@ -180,7 +182,7 @@ ENABLED = true SUBJECT_PREFIX = {{ gitea_mail_subject_prefix }} {% endif %} FROM = {{ gitea_mail_service_from }} -MAILER_TYPE = sendmail +PROTOCOL = sendmail SENDMAIL_PATH = /usr/sbin/sendmail {% else %} [mailer] @@ -189,7 +191,7 @@ ENABLED = false [session] PROVIDER = {{ gitea_session_provider }} -PROVIDER_CONFIG = "{{ gitea_session_provider_config }}" +PROVIDER_CONFIG = {{ gitea_session_provider_config }} COOKIE_NAME = {{ gitea_session_cookie_name }} COOKIE_SECURE = {{ gitea_session_cookie_secure | bool | lower }} ENABLE_SET_COOKIE = {{ gitea_session_enable_set_cookie | bool | lower }} @@ -221,12 +223,11 @@ MODE = file REDIRECT_MACARON_LOG = true MACARON = file ROUTER_LOG_LEVEL = Info -ROUTER = file -ENABLE_ACCESS_LOG = true +logger.router.MODE = file {% raw %} ACCESS_LOG_TEMPLATE = {{.Ctx.RemoteAddr}} - {{.Identity}} {{.Start.Format "[02/Jan/2006:15:04:05 -0700]" }} "{{.Ctx.Req.Method}} {{.Ctx.Req.RequestURI}} {{.Ctx.Req.Proto}}" {{.ResponseWriter.Status}} {{.ResponseWriter.Size}} "{{.Ctx.Req.Referer}}\" \"{{.Ctx.Req.UserAgent}}" {% endraw %} -ACCESS = file +logger.access.MODE = file LEVEL = {{ gitea_log_level }} STACKTRACE_LEVEL = None @@ -304,7 +305,7 @@ SHOW_FOOTER_TEMPLATE_LOAD_TIME = {{ gitea_footer_show_template_load_time | bool [markup.asciidoc] ENABLED = false FILE_EXTENSIONS = .adoc,.asciidoc -RENDER_COMMAND = "asciidoc --out-file=- -" +RENDER_COMMAND = asciidoc --out-file=- - IS_INPUT_FILE = false [metrics]