Skip to content

Commit 2d174e2

Browse files
authored
Merge pull request roles-ansible#114 from roles-ansible/1.20
Refactor setting.Other
2 parents 5022106 + 12bbd17 commit 2d174e2

File tree

5 files changed

+8
-11
lines changed

5 files changed

+8
-11
lines changed

.github/workflows/ansible-linting-check.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@
22
name: Ansible Lint check
33

44
# yamllint disable-line rule:truthy
5-
on:
6-
push:
7-
branches: '*'
8-
pull_request:
9-
branches: '*'
5+
on: [push, pull_request]
106

117
jobs:
128
build:
13-
9+
name: Ansible Lint
1410
runs-on: ubuntu-latest
1511

1612
steps:
1713
- name: 'checkout git repo'
1814
uses: actions/checkout@v3
15+
with:
16+
lfs: true
17+
submodules: false
18+
fetch-depth: 0
1919

2020
- name: 'Lint Ansible Playbook'
2121
uses: ansible/ansible-lint-action@v6
2222
with:
23-
targets: "."
23+
path: "."

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,6 @@ Either you define exactly which release you install. Or you use the option ``lat
313313
### Other ([other](https://docs.gitea.io/en-us/config-cheat-sheet/#other-other))
314314
| variable name | default value | description |
315315
| ------------- | ------------- | ----------- |
316-
| `gitea_other_show_footer_branding` | `false` | Show Gitea branding in the footer. |
317316
| `gitea_other_show_footer_version` | `true` | Show Gitea and Go version information in the footer. |
318317
| `gitea_other_show_footer_template_load_time` | `true` | Show time of template execution in the footer. |
319318
| `gitea_other_enable_sitemap` | `true` | Generate sitemap. |

defaults/main.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,6 @@ gitea_actions_extra: ''
242242

243243
# Other (other)
244244
# -> https://docs.gitea.io/en-us/config-cheat-sheet/#other-other
245-
gitea_other_show_footer_branding: false
246245
gitea_other_show_footer_version: true
247246
gitea_other_show_footer_template_load_time: true
248247
gitea_other_enable_sitemap: true

templates/gitea.ini.j2

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,6 @@ DEFAULT_ACTIONS_URL = {{ gitea_actions_default_actions_url }}
288288
; Other (other)
289289
; -> https://docs.gitea.io/en-us/config-cheat-sheet/#other-other
290290
[other]
291-
SHOW_FOOTER_BRANDING = {{ gitea_other_show_footer_branding | ternary('true', 'false') }}
292291
SHOW_FOOTER_VERSION = {{ gitea_other_show_footer_version | ternary('true', 'false') }}
293292
SHOW_FOOTER_TEMPLATE_LOAD_TIME = {{ gitea_other_show_footer_template_load_time | ternary('true', 'false') }}
294293
ENABLE_SITEMAP = {{ gitea_other_enable_sitemap | ternary('true', 'false') }}

vars/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,5 @@ transfer_custom_footer:
6262
- 'files/gitea_footer/extra_links_footer.tmpl'
6363
- 'files/extra_links_footer.tmpl'
6464

65-
playbook_version_number: 48 # should be int
65+
playbook_version_number: 49 # should be int
6666
playbook_version_path: 'do1jlr.gitea.version'

0 commit comments

Comments
 (0)