Skip to content

Commit d1708b7

Browse files
authored
Merge pull request roles-ansible#104 from benoit-garcia/main
fix(config): Fix name of the actionssection in the configuration file.
2 parents 6b92002 + 0b153a7 commit d1708b7

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

templates/gitea.ini.j2

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ RUN_MODE = {{ gitea_run_mode }}
1313
;
1414
; -> https://docs.gitea.io/en-us/config-cheat-sheet/#repository-repository
1515
[repository]
16-
DEFAULT_BRANCH = {{ gitea_default_branch }}
16+
ROOT = {{ gitea_repository_root }}
17+
FORCE_PRIVATE = {{ gitea_force_private | ternary('true', 'false') }}
1718
DEFAULT_PRIVATE = {{ gitea_default_private }}
18-
DEFAULT_REPO_UNITS = {{ gitea_default_repo_units }}
19-
DISABLED_REPO_UNITS = {{ gitea_disabled_repo_units }}
19+
MAX_CREATION_LIMIT = {{ gitea_user_repo_limit }}
2020
DISABLE_HTTP_GIT = {{ gitea_disable_http_git | ternary('true', 'false') }}
21-
DISABLE_STARS = {{ gitea_disable_stars | ternary('true', 'false') }}
22-
ENABLE_PUSH_CREATE_ORG = {{ gitea_enable_push_create_org | ternary('true', 'false') }}
2321
ENABLE_PUSH_CREATE_USER = {{ gitea_enable_push_create_user | ternary('true', 'false') }}
24-
FORCE_PRIVATE = {{ gitea_force_private | ternary('true', 'false') }}
25-
MAX_CREATION_LIMIT = {{ gitea_user_repo_limit }}
26-
ROOT = {{ gitea_repository_root }}
22+
ENABLE_PUSH_CREATE_ORG = {{ gitea_enable_push_create_org | ternary('true', 'false') }}
23+
DISABLED_REPO_UNITS = {{ gitea_disabled_repo_units }}
24+
DEFAULT_REPO_UNITS = {{ gitea_default_repo_units }}
25+
DISABLE_STARS = {{ gitea_disable_stars | ternary('true', 'false') }}
26+
DEFAULT_BRANCH = {{ gitea_default_branch }}
2727
{{ gitea_repository_extra_config }}
2828
;
2929
;
@@ -51,9 +51,9 @@ MERGES = {{ gitea_repo_merges }}
5151
;
5252
; -> https://docs.gitea.io/en-us/config-cheat-sheet/#cors-cors
5353
[cors]
54-
ENABLED = {{ gitea_enable_cors | ternary('true', 'false') }}
55-
SCHEME = {{ gitea_cors_scheme }}
56-
ALLOW_DOMAIN = {{ gitea_cors_allow_domain }}
54+
ENABLED = {{ gitea_enable_cors | ternary('true', 'false') }}
55+
SCHEME = {{ gitea_cors_scheme }}
56+
ALLOW_DOMAIN = {{ gitea_cors_allow_domain }}
5757
ALLOW_SUBDOMAIN = {{ gitea_cors_allow_subdomain | ternary('true', 'false') }}
5858
METHODS = {{ gitea_cors_methods }}
5959
MAX_AGE = {{ gitea_cors_max_age }}
@@ -66,9 +66,9 @@ X_FRAME_OPTIONS = {{ gitea_cors_x_frame_options }}
6666
;
6767
; -> https://docs.gitea.io/en-us/config-cheat-sheet/#ui-ui
6868
[ui]
69-
SHOW_USER_EMAIL = {{ gitea_show_user_email | ternary('true', 'false') }}
70-
DEFAULT_THEME = {{ gitea_theme_default }}
7169
THEMES = {{ gitea_themes }}
70+
DEFAULT_THEME = {{ gitea_theme_default }}
71+
SHOW_USER_EMAIL = {{ gitea_show_user_email | ternary('true', 'false') }}
7272
{{ gitea_ui_extra_config }}
7373
;
7474
;
@@ -82,6 +82,7 @@ KEYWORDS = {{ gitea_ui_keywords }}
8282
;
8383
; -> https://docs.gitea.io/en-us/config-cheat-sheet/#server-server
8484
[server]
85+
APP_DATA_PATH = {{ gitea_home }}/data
8586
PROTOCOL = {{ gitea_protocol }}
8687
DOMAIN = {{ gitea_http_domain }}
8788
ROOT_URL = {{ gitea_root_url }}
@@ -92,18 +93,17 @@ SSH_DOMAIN = {{ gitea_ssh_domain }}
9293
SSH_PORT = {{ gitea_ssh_port }}
9394
SSH_LISTEN_HOST = {{ gitea_ssh_listen }}
9495
OFFLINE_MODE = {{ gitea_offline_mode | ternary('true', 'false') }}
95-
APP_DATA_PATH = {{ gitea_home }}/data
96+
{% if gitea_enable_tls_certs | bool %}
97+
CERT_FILE = {{ gitea_tls_cert_file }}
98+
KEY_FILE = {{ gitea_tls_key_file }}
99+
{% endif %}
96100
LANDING_PAGE = {{ gitea_landing_page }}
97101
{% if gitea_lfs_server_enabled | bool -%}
98102
LFS_START_SERVER = true
99103
LFS_JWT_SECRET = {{ gitea_lfs_jwt_secret }}
100104
{% endif %}
101105
REDIRECT_OTHER_PORT = {{ gitea_redirect_other_port | ternary('true', 'false') }}
102106
PORT_TO_REDIRECT = {{ gitea_port_to_redirect }}
103-
{% if gitea_enable_tls_certs | bool %}
104-
CERT_FILE = {{ gitea_tls_cert_file }}
105-
KEY_FILE = {{ gitea_tls_key_file }}
106-
{% endif %}
107107
ENABLE_ACME = {{ gitea_enable_acme | ternary('true', 'false') }}
108108
{% if gitea_enable_acme | bool %}
109109
{% if gitea_acme_url != '' %}
@@ -162,15 +162,15 @@ PASSWORD_CHECK_PWN = {{ gitea_password_check_pwn | ternary('true', 'false') }}
162162
;
163163
; -> https://docs.gitea.io/en-us/config-cheat-sheet/#service-service
164164
[service]
165-
DISABLE_REGISTRATION = {{ gitea_disable_registration | ternary('true', 'false') }}
166165
REGISTER_EMAIL_CONFIRM = {{ gitea_register_email_confirm | ternary('true', 'false') }}
166+
DISABLE_REGISTRATION = {{ gitea_disable_registration | ternary('true', 'false') }}
167167
REQUIRE_SIGNIN_VIEW = {{ gitea_require_signin | ternary('true', 'false') }}
168-
DEFAULT_KEEP_EMAIL_PRIVATE = {{ gitea_default_keep_mail_private | ternary('true', 'false') }}
168+
ENABLE_NOTIFY_MAIL = {{ gitea_enable_notify_mail | ternary('true', 'false') }}
169169
ENABLE_CAPTCHA = {{ gitea_enable_captcha | ternary('true', 'false') }}
170+
DEFAULT_KEEP_EMAIL_PRIVATE = {{ gitea_default_keep_mail_private | ternary('true', 'false') }}
170171
SHOW_REGISTRATION_BUTTON = {{ gitea_show_registration_button | ternary('true', 'false') }}
171-
ALLOW_ONLY_EXTERNAL_REGISTRATION = {{ gitea_only_allow_external_registration | ternary('true', 'false') }}
172-
ENABLE_NOTIFY_MAIL = {{ gitea_enable_notify_mail | ternary('true', 'false') }}
173172
AUTO_WATCH_NEW_REPOS = {{ gitea_auto_watch_new_repos | ternary('true', 'false') }}
173+
ALLOW_ONLY_EXTERNAL_REGISTRATION = {{ gitea_only_allow_external_registration | ternary('true', 'false') }}
174174
{{ gitea_service_extra_config }}
175175
;
176176
;
@@ -222,11 +222,11 @@ PATH = {{ gitea_home }}/data/attachments
222222
[log]
223223
ROOT_PATH = {{ gitea_home }}/log
224224
{% if gitea_log_systemd %}
225-
MODE = console
225+
MODE = console
226226
{% else %}
227-
MODE = file
227+
MODE = file
228228
{% endif %}
229-
LEVEL = {{ gitea_log_level }}
229+
LEVEL = {{ gitea_log_level }}
230230
{{ gitea_log_extra_config }}
231231
;
232232
;
@@ -273,8 +273,8 @@ PATH = {{ gitea_lfs_content_path }}
273273
;
274274
{% if gitea_actions_enabled | bool %}
275275
; -> https://docs.gitea.io/en-us/config-cheat-sheet/#actions-actions
276-
[actons]
277-
ENABLED = {{ gitea_actions_enabled }}
276+
[actions]
277+
ENABLED = {{ gitea_actions_enabled }}
278278
DEFAULT_ACTIONS_URL = {{ gitea_actions_default_actions_url }}
279279
{{ gitea_actions_extra }}
280280
{% endif %}

templates/gitea.service.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ After=network.target
55
[Service]
66
User={{ gitea_user }}
77
Group={{ gitea_group }}
8-
ExecStart={{ gitea_full_executable_path }} web -c {{ gitea_configuraion_path }}/gitea.ini --custom-path {{ gitea_custom }}/
8+
ExecStart={{ gitea_full_executable_path }} web --config {{ gitea_configuraion_path }}/gitea.ini --custom-path {{ gitea_custom }}/
99
Restart=on-failure
1010
WorkingDirectory={{ gitea_home }}
1111
{% if gitea_systemd_cap_net_bind_service %}

0 commit comments

Comments
 (0)