From dc5d8c60ee6abd08c8ab136fd3b9e158d0c78856 Mon Sep 17 00:00:00 2001 From: L3D Date: Tue, 10 Oct 2023 19:30:38 +0200 Subject: [PATCH] Cleanup whitespace and change linter --- .github/galaxy.svg | 85 ----------- .github/license.svg | 60 -------- .github/workflows/ansible-linting-check.yml | 8 +- templates/gitea.ini.j2 | 156 ++++++++++---------- vars/main.yml | 2 +- 5 files changed, 83 insertions(+), 228 deletions(-) delete mode 100644 .github/galaxy.svg delete mode 100644 .github/license.svg diff --git a/.github/galaxy.svg b/.github/galaxy.svg deleted file mode 100644 index 5e5c1f3..0000000 --- a/.github/galaxy.svg +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.github/license.svg b/.github/license.svg deleted file mode 100644 index c711475..0000000 --- a/.github/license.svg +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.github/workflows/ansible-linting-check.yml b/.github/workflows/ansible-linting-check.yml index 0b1268c..81008bf 100644 --- a/.github/workflows/ansible-linting-check.yml +++ b/.github/workflows/ansible-linting-check.yml @@ -11,13 +11,13 @@ jobs: steps: - name: 'checkout git repo' - uses: actions/checkout@v4 + uses: actions/checkout@v4.1.0 with: lfs: true submodules: false fetch-depth: 0 - - name: 'Lint Ansible Playbook' - uses: ansible/ansible-lint-action@v6 + - name: Run ansible-lint + uses: ansible-actions/ansible-lint-action@v0.0.2 with: - path: "." + target: "./" diff --git a/templates/gitea.ini.j2 b/templates/gitea.ini.j2 index e7be89c..15ba1f8 100644 --- a/templates/gitea.ini.j2 +++ b/templates/gitea.ini.j2 @@ -1,18 +1,18 @@ ; this file is the configuration of your local gitea instance ; {{ ansible_managed }} -; +; ; This file overwrites the default values from gitea. ; undefined variables will use the default value from gitea. -; Cheat Sheet: https://docs.gitea.io/en-us/config-cheat-sheet/ -; -; -> https://docs.gitea.io/en-us/config-cheat-sheet/#overall-default +; Cheat Sheet: https://docs.gitea.com/next/administration/config-cheat-sheet/ +; +; -> https://docs.gitea.com/next/administration/config-cheat-sheet#overall-default APP_NAME = {{ gitea_app_name }} RUN_USER = {{ gitea_user }} RUN_MODE = {{ gitea_run_mode }} WORK_PATH = {{ gitea_home }} -; -; -; -> https://docs.gitea.io/en-us/config-cheat-sheet/#repository-repository +; +; +; -> https://docs.gitea.com/next/administration/config-cheat-sheet/#repository-repository [repository] ROOT = {{ gitea_repository_root }} FORCE_PRIVATE = {{ gitea_force_private | ternary('true', 'false') }} @@ -26,18 +26,18 @@ DEFAULT_REPO_UNITS = {{ gitea_default_repo_units }} DISABLE_STARS = {{ gitea_disable_stars | ternary('true', 'false') }} DEFAULT_BRANCH = {{ gitea_default_branch }} {{ gitea_repository_extra_config }} -; -; -; -> https://docs.gitea.io/en-us/administration/config-cheat-sheet/#repository---upload-repositoryupload +; +; +; -> https://docs.gitea.com/next/administration/administration/config-cheat-sheet/#repository---upload-repositoryupload [repository.upload] ENABLED = {{ gitea_repository_upload_enabled | ternary('true', 'false') }} TEMP_PATH = {{ gitea_home }}/data/tmp/uploads FILE_MAX_SIZE = {{ gitea_repository_upload_max_size }} {{ gitea_repository_upload_extra_config }} -; -; +; +; {% if gitea_enable_repo_signing_options | bool %} -; -> https://docs.gitea.io/en-us/config-cheat-sheet/#repository---signing-repositorysigning +; -> https://docs.gitea.com/next/administration/config-cheat-sheet/#repository---signing-repositorysigning [repository.signing] SIGNING_KEY = {{ gitea_repo_signing_key }} SIGNING_NAME = {{ gitea_repo_signing_name }} @@ -48,12 +48,12 @@ WIKI = {{ gitea_repo_wiki }} CRUD_ACTIONS = {{ gitea_repo_crud_actions }} MERGES = {{ gitea_repo_merges }} {{ gitea_enable_repo_signing_extra }} -; +; {% endif %} -; +; {% if gitea_enable_cors | bool %} -; -; -> https://docs.gitea.io/en-us/config-cheat-sheet/#cors-cors +; +; -> https://docs.gitea.com/next/administration/config-cheat-sheet/#cors-cors [cors] ENABLED = {{ gitea_enable_cors | ternary('true', 'false') }} SCHEME = {{ gitea_cors_scheme }} @@ -65,26 +65,26 @@ ALLOW_CREDENTIALS = {{ gitea_cors_allow_credentials | ternary('true', 'false') } HEADERS = {{ gitea_cors_headers }} X_FRAME_OPTIONS = {{ gitea_cors_x_frame_options }} {{ gitea_cors_extra }} -; +; {% endif %} -; -; -> https://docs.gitea.io/en-us/config-cheat-sheet/#ui-ui +; +; -> https://docs.gitea.com/next/administration/config-cheat-sheet/#ui-ui [ui] THEMES = {{ gitea_themes }} DEFAULT_THEME = {{ gitea_theme_default }} SHOW_USER_EMAIL = {{ gitea_show_user_email | ternary('true', 'false') }} {{ gitea_ui_extra_config }} -; -; -; +; +; +; [ui.meta] AUTHOR = {{ gitea_ui_author }} DESCRIPTION = {{ gitea_ui_description }} KEYWORDS = {{ gitea_ui_keywords }} {{ gitea_ui_meta_extra_config }} -; -; -; -> https://docs.gitea.io/en-us/config-cheat-sheet/#server-server +; +; +; -> https://docs.gitea.com/next/administration/config-cheat-sheet/#server-server [server] APP_DATA_PATH = {{ gitea_home }}/data PROTOCOL = {{ gitea_protocol }} @@ -119,9 +119,9 @@ ACME_EMAIL = {{ gitea_acme_email }} ACME_CA_ROOT = {{ gitea_acme_ca_root }} {% endif %} {{ gitea_server_extra_config }} -; -; -; -> https://docs.gitea.io/en-us/config-cheat-sheet/#database-database +; +; +; -> https://docs.gitea.com/next/administration/config-cheat-sheet/#database-database [database] DB_TYPE = {{ gitea_db_type }} HOST = {{ gitea_db_host }} @@ -132,9 +132,9 @@ SSL_MODE = {{ gitea_db_ssl }} PATH = {{ gitea_db_path }} LOG_SQL = {{ gitea_db_log_sql | ternary('true', 'false') }} {{ gitea_database_extra_config }} -; -; -; -> https://docs.gitea.io/en-us/config-cheat-sheet/#indexer-indexer +; +; +; -> https://docs.gitea.com/next/administration/config-cheat-sheet/#indexer-indexer [indexer] ISSUE_INDEXER_PATH = {{ gitea_home }}/indexers/issues.bleve REPO_INDEXER_ENABLED = {{ gitea_repo_indexer_enabled | ternary('true', 'false') }} @@ -144,16 +144,16 @@ REPO_INDEXER_EXCLUDE = {{ gitea_repo_indexer_exclude }} REPO_INDEXER_EXCLUDE_VENDORED = {{ gitea_repo_exclude_vendored | ternary('true', 'false') }} MAX_FILE_SIZE = {{ gitea_repo_indexer_max_file_size }} {{ gitea_indexer_extra_config }} -; -; +; +; ; Queue (queue and queue.*) -; -> https://docs.gitea.io/en-us/config-cheat-sheet/#queue-queue-and-queue +; -> https://docs.gitea.com/next/administration/config-cheat-sheet/#queue-queue-and-queue [queue.issue_indexer] DATADIR = {{ gitea_home }}/indexers/issues.queue {{ gitea_queue_issue_indexer_extra_config }} -; -; -; -> https://docs.gitea.io/en-us/config-cheat-sheet/#security-security +; +; +; -> https://docs.gitea.com/next/administration/config-cheat-sheet/#security-security [security] INSTALL_LOCK = true SECRET_KEY = {{ gitea_secret_key }} @@ -162,9 +162,9 @@ DISABLE_WEBHOOKS = {{ gitea_disable_webhooks | ternary('true', 'false') }} INTERNAL_TOKEN = {{ gitea_internal_token }} PASSWORD_CHECK_PWN = {{ gitea_password_check_pwn | ternary('true', 'false') }} {{ gitea_security_extra_config }} -; -; -; -> https://docs.gitea.io/en-us/config-cheat-sheet/#service-service +; +; +; -> https://docs.gitea.com/next/administration/config-cheat-sheet/#service-service [service] REGISTER_EMAIL_CONFIRM = {{ gitea_register_email_confirm | ternary('true', 'false') }} DISABLE_REGISTRATION = {{ gitea_disable_registration | ternary('true', 'false') }} @@ -188,9 +188,9 @@ DEFAULT_ORG_VISIBILITY = {{ gitea_default_org_visibility | ternary('true', 'fals ALLOW_ONLY_INTERNAL_REGISTRATION = {{ gitea_allow_only_internal_registration | ternary('true', 'false') }} ALLOW_ONLY_EXTERNAL_REGISTRATION = {{ gitea_allow_only_external_registration | ternary('true', 'false') }} {{ gitea_service_extra_config }} -; -; -; -> https://docs.gitea.io/en-us/config-cheat-sheet/#mailer-mailer +; +; +; -> https://docs.gitea.com/next/administration/config-cheat-sheet/#mailer-mailer [mailer] ENABLED = {{ gitea_mailer_enabled | ternary('true', 'false') }} {% if gitea_mailer_enabled | bool %} @@ -210,33 +210,33 @@ FROM = {{ gitea_mailer_from }} SUBJECT_PREFIX = {{ gitea_subject_prefix }} SEND_AS_PLAIN_TEXT = {{ gitea_mailer_send_as_plaintext | ternary('true', 'false') }} {{ gitea_mailer_extra_config }} -; +; {% endif %} -; -; -; -> https://docs.gitea.io/en-us/config-cheat-sheet/#session-session +; +; +; -> https://docs.gitea.com/next/administration/config-cheat-sheet/#session-session [session] PROVIDER = {{ gitea_session_provider }} PROVIDER_CONFIG = {{ gitea_home }}/data/sessions {{ gitea_session_extra_config }} -; -; -; -> https://docs.gitea.io/en-us/config-cheat-sheet/#picture-picture +; +; +; -> https://docs.gitea.com/next/administration/config-cheat-sheet/#picture-picture [picture] AVATAR_UPLOAD_PATH = {{ gitea_home }}/data/avatars {{ gitea_picture_extra_config }} -; -; -; -> https://docs.gitea.io/en-us/config-cheat-sheet/#issue-and-pull-request-attachments-attachment +; +; +; -> https://docs.gitea.com/next/administration/config-cheat-sheet/#issue-and-pull-request-attachments-attachment [attachment] ENABLED = {{ gitea_attachment_enabled | ternary('true', 'false') }} ALLOWED_TYPES = {{ gitea_attachment_types }} MAX_SIZE = {{ gitea_attachment_max_size }} PATH = {{ gitea_home }}/data/attachments {{ gitea_attachment_extra_config }} -; -; -; -> https://docs.gitea.io/en-us/config-cheat-sheet/#log-log +; +; +; -> https://docs.gitea.com/next/administration/config-cheat-sheet/#log-log [log] ROOT_PATH = {{ gitea_home }}/log {% if gitea_log_systemd %} @@ -246,60 +246,60 @@ MODE = file {% endif %} LEVEL = {{ gitea_log_level }} {{ gitea_log_extra_config }} -; -; -; -> https://docs.gitea.io/en-us/config-cheat-sheet/#metrics-metrics +; +; +; -> https://docs.gitea.com/next/administration/config-cheat-sheet/#metrics-metrics [metrics] ENABLED = {{ gitea_metrics_enabled | ternary('true', 'false') }} TOKEN = {{ gitea_metrics_token }} {{ gitea_metrics_extra }} -; -; -; -> https://docs.gitea.io/en-us/config-cheat-sheet/#oauth2-oauth2 +; +; +; -> https://docs.gitea.com/next/administration/config-cheat-sheet/#oauth2-oauth2 [oauth2] ENABLE = {{ gitea_oauth2_enabled | ternary('true', 'false') }} JWT_SECRET = {{ gitea_oauth2_jwt_secret }} {{ gitea_oauth2_extra_config }} -; -; -; -> https://docs.gitea.io/en-us/config-cheat-sheet/#federation-federation +; +; +; -> https://docs.gitea.com/next/administration/config-cheat-sheet/#federation-federation [federation] ENABLED = {{ gitea_federation_enabled | ternary('true', 'false') }} SHARE_USER_STATISTICS = {{ gitea_federation_share_user_stats | ternary('true', 'false') }} {{ gitea_federation_extra }} -; -; +; +; ; Packages (packages) -; -> https://docs.gitea.io/en-us/config-cheat-sheet/#packages-packages +; -> https://docs.gitea.com/next/administration/config-cheat-sheet/#packages-packages [packages] ENABLED = {{ gitea_packages_enabled | ternary('true', 'false') }} {% if gitea_packages_enabled | bool %} CHUNKED_UPLOAD_PATH = {{ gitea_home }}/data/tmp/package-upload {{ gitea_packages_extra }} {% endif %} -; -; +; +; {% if gitea_lfs_server_enabled | bool %} -; -> https://docs.gitea.io/en-us/config-cheat-sheet/#lfs-lfs +; -> https://docs.gitea.com/next/administration/config-cheat-sheet/#lfs-lfs [lfs] STORAGE_TYPE = {{ gitea_lfs_storage_type }} SERVE_DIRECT = {{ gitea_lfs_serve_direct | ternary('true', 'false') }} PATH = {{ gitea_lfs_content_path }} {{ gitea_lfs_extra }} {% endif %} -; -; +; +; {% if gitea_actions_enabled | bool %} -; -> https://docs.gitea.io/en-us/config-cheat-sheet/#actions-actions +; -> https://docs.gitea.com/next/administration/config-cheat-sheet/#actions-actions [actions] ENABLED = {{ gitea_actions_enabled }} DEFAULT_ACTIONS_URL = {{ gitea_actions_default_actions_url }} {{ gitea_actions_extra }} {% endif %} -; -; +; +; ; Other (other) -; -> https://docs.gitea.io/en-us/config-cheat-sheet/#other-other +; -> https://docs.gitea.com/next/administration/config-cheat-sheet/#other-other [other] SHOW_FOOTER_VERSION = {{ gitea_other_show_footer_version | ternary('true', 'false') }} SHOW_FOOTER_TEMPLATE_LOAD_TIME = {{ gitea_other_show_footer_template_load_time | ternary('true', 'false') }} diff --git a/vars/main.yml b/vars/main.yml index 87f226a..d6abe74 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -62,5 +62,5 @@ transfer_custom_footer: - 'files/gitea_footer/extra_links_footer.tmpl' - 'files/extra_links_footer.tmpl' -playbook_version_number: 50 # should be int +playbook_version_number: 51 # should be int playbook_version_path: 'do1jlr.gitea.version'