fix(ansible-galaxy): adapt indentation

.ansible-lint

@@ -1,3 +1,4 @@
 ---
 
-skip_list: []
+exclude_paths:
+- .gitea/

.drone.yml

@@ -1,94 +0,0 @@
----
-kind: pipeline
-type: kubernetes
-name: linter
-
-platform:
-  os: linux
-
-steps:
-- name: markdown lint
-  commands:
-  - markdownlint *.md
-  image: docker.io/volkerraschek/markdownlint:0.31.1
-  resources:
-    limits:
-      cpu: 50
-      memory: 50M
-
-- name: email-notification
-  environment:
-    PLUGIN_HOST:
-      from_secret: smtp_host
-    PLUGIN_USERNAME:
-      from_secret: smtp_username
-    PLUGIN_PASSWORD:
-      from_secret: smtp_password
-    PLUGIN_FROM:
-      from_secret: smtp_mail_address
-  image: docker.io/drillster/drone-email:latest
-  resources:
-    limits:
-      cpu: 50
-      memory: 25M
-  when:
-    status:
-    - changed
-    - failure
-
-trigger:
-  event:
-    exclude:
-    - tag
-
----
-kind: pipeline
-type: kubernetes
-name: sync
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
-- name: github
-  image: docker.io/appleboy/drone-git-push:latest
-  resources:
-    limits:
-      cpu: 50
-      memory: 25M
-  settings:
-    branch: master
-    remote: ssh://git@github.com/volker-raschek/git-role.git
-    force: true
-    ssh_key:
-      from_secret: ssh_key
-
-- name: email-notification
-  environment:
-    PLUGIN_HOST:
-      from_secret: smtp_host
-    PLUGIN_USERNAME:
-      from_secret: smtp_username
-    PLUGIN_PASSWORD:
-      from_secret: smtp_password
-    PLUGIN_FROM:
-      from_secret: smtp_mail_address
-  image: docker.io/drillster/drone-email:latest
-  resources:
-    limits:
-      cpu: 50
-      memory: 25M
-  when:
-    status:
-    - changed
-    - failure
-
-trigger:
-  branch:
-  - master
-  event:
-  - cron
-  - push
-  repo:
-  - volker.raschek/git-role

.gitea/workflows/ansible-linters.yaml

@@ -0,0 +1,20 @@
+name: Ansible Linter
+
+on:
+  pull_request:
+    types: [ "opened", "reopened", "synchronize" ]
+  push:
+    branches: [ '**' ]
+    tags-ignore: [ '**' ]
+
+jobs:
+  ansible-lint:
+    runs-on:
+    - ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Run ansible-lint
+      uses: ansible/ansible-lint@v25.7.0
+      with:
+        args: "--config-file .ansible-lint"
+        setup_python: "true"

.gitea/workflows/markdown-linters.yaml

@@ -0,0 +1,18 @@
+name: Lint Markdown files
+
+on:
+  pull_request:
+    types: [ "opened", "reopened", "synchronize" ]
+  push:
+    branches: [ '**' ]
+    tags-ignore: [ '**' ]
+
+jobs:
+  markdown-lint:
+    runs-on:
+    - ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4.2.2
+    - uses: DavidAnson/markdownlint-cli2-action@v20.0.0
+      with:
+        globs: '**/*.md'

.gitignore

@@ -0,0 +1 @@
+.ansible

.markdownlint.yaml

@@ -45,19 +45,17 @@ MD012:
 # MD013/line-length - Line length
 MD013:
   # Number of characters
-  line_length: 80
+  line_length: 120
   # Number of characters for headings
-  heading_line_length: 80
+  heading_line_length: 120
   # Number of characters for code blocks
-  code_block_line_length: 80
+  code_block_line_length: 120
   # Include code blocks
   code_blocks: false
   # Include tables
   tables: false
   # Include headings
   headings: true
-  # Include headings
-  headers: true
   # Strict length checking
   strict: false
   # Stern length checking
@@ -70,11 +68,6 @@ MD022:
   # Blank lines below heading
   lines_below: 1
 
-# MD024/no-duplicate-heading/no-duplicate-header - Multiple headings with the same content
-MD024:
-  # Only check sibling headings
-  allow_different_nesting: true
-
 # MD025/single-title/single-h1 - Multiple top-level headings in the same document
 MD025:
   # Heading level
@@ -128,7 +121,8 @@ MD041:
 # MD044/proper-names - Proper names should have the correct capitalization
 MD044:
   # List of proper names
-  names: []
+  names:
+  - gitea
   # Include code blocks
   code_blocks: false
 
@@ -140,4 +134,4 @@ MD046:
 # MD048/code-fence-style - Code fence style
 MD048:
   # Code fence syle
-  style: "backtick"
+  style: "backtick"

.yamllint.yaml

@@ -0,0 +1,17 @@
+#
+# Documentation:
+# https://yamllint.readthedocs.io/en/stable/
+#
+
+rules:
+  brackets:
+    forbid: false
+    min-spaces-inside: 0
+    max-spaces-inside: 2
+    min-spaces-inside-empty: 0
+    max-spaces-inside-empty: 0
+  indentation:
+    spaces: 2
+    indent-sequences: false
+  line-length:
+    max: 360

README.md

@@ -1,14 +1,13 @@
 # git-role
 
-[![Build Status](https://drone.cryptic.systems/api/badges/volker.raschek/git-role/status.svg)](https://drone.cryptic.systems/volker.raschek/git-role)
+[![Ansible Role](https://img.shields.io/ansible/role/d/58759)](https://galaxy.ansible.com/volker_raschek/git)
-[![Ansible Role](https://img.shields.io/ansible/role/d/58170)](https://galaxy.ansible.com/volker_raschek/git_role)
 
 With following role can be git for users configured.
 
 ## Installation
 
 ```bash
-ansible-galaxy install volker_raschek.git_role
+ansible-galaxy install volker_raschek.git
 ```
 
 ## Supported distributions

defaults/main.yml

@@ -1,8 +1,20 @@
 ---
 
+git_install_merge_tool: false
+git_package_name_merge_tool: meld
+
 git_users: []
   # github:
+  #   allowedSignersFile:
+  #   - principals:
+  #     - max.mustermann@example.com
+  #     publicSSHKey: ssh-rsa AAAAX1...
   #   config:
+  #     commit:
+  #       gpgSign: "true"
   #     user:
   #       name: "root"
   #       email: root@localhost
+  #       signingKey: gpg-fingerprint
+  #   revocationFile:
+  #   - ssh-rsa AAAAX1...

meta/main.yml

@@ -0,0 +1,24 @@
+dependencies: []
+galaxy_info:
+  author: Markus Pesch
+  company: Cryptic Systems
+  description: Role to install and configure git for local users
+  galaxy_tags:
+  - git
+  license: MIT
+  min_ansible_version: "2.5"
+  namespace: volker-raschek
+  platforms:
+  - name: ArchLinux
+    versions:
+    - all
+  - name: EL
+    versions:
+    - all
+  - name: Fedora
+    versions:
+    - all
+  - name: Ubuntu
+    versions:
+    - all
+  role_name: git

renovate.json

@@ -1,17 +1,9 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "assignees": [ "volker.raschek" ],
+  "extends": [
-  "automergeStrategy": "merge-commit",
+    "local>volker.raschek/renovate-config:default#master",
-  "automergeType": "pr",
+    "local>volker.raschek/renovate-config:container#master",
-  "labels": [ "renovate" ],
+    "local>volker.raschek/renovate-config:actions#master",
-  "packageRules": [
+    "local>volker.raschek/renovate-config:regexp#master"
-    {
+  ]
-      "addLabels": [ "renovate/droneci", "renovate/automerge" ],
+}
-      "automerge": true,
-      "matchManagers": "droneci",
-      "matchUpdateTypes": [ "minor", "patch"]
-    }
-  ],
-  "rebaseLabel": "renovate/rebase",
-  "rebaseWhen": "behind-base-branch"
-}

tasks/git_user.yml

@@ -1,28 +1,30 @@
 ---
 
-- name: Get entity for user {{ item.key }}
+- name: "Determine entries via NSS for unix user: {{ item.key }}"
-  getent:
+  ansible.builtin.getent:
     database: passwd
     key: "{{ item.key }}"
 
-- name: Create git config directory for {{ item.key }}
+- name: "Create git config directory for unix user: {{ item.key }}"
-  file:
+  ansible.builtin.file:
     dest: "{{ getent_passwd[item.key][4] }}/.config/git"
     owner: "{{ item.key }}"
     group: "{{ getent_passwd[item.key][2] }}"
     state: directory
-    mode: 0755
+    mode: "0755"
 
 - name: Create global git config files
-  template:
+  ansible.builtin.template:
     src: "{{ filename }}.j2"
     dest: "{{ getent_passwd[item.key][4] }}/{{ filename }}"
     owner: "{{ item.key }}"
     group: "{{ getent_passwd[item.key][2] }}"
-    mode: 0644
+    mode: "0644"
   with_items:
+  - .config/git/allowedSignersFile
   - .config/git/config
   - .config/git/message
   - .config/git/ignore
+  - .config/git/revocationFile
   loop_control:
     loop_var: filename

tasks/main.yml

@@ -1,15 +1,24 @@
 ---
 
-- name: Include special distribution-dependent variables
+- name: Include OS-specific variables
-  include_vars: "{{ ansible_os_family }}.yml"
+  ansible.builtin.include_vars: "{{ ansible_os_family }}.yml"
 
 - name: Install git and dependencies
-  package:
+  vars:
-    name: "{{ item }}"
+    _git_package_names: "{{ git_package_names }}"
-    state: present
+  block:
-  with_items: "{{ git_package_names }}"
+  - name: Add merge tool
+    ansible.builtin.set_fact:
+      _git_package_names: "{{ _git_package_names + [git_package_name_merge_tool] }}"
+    when: git_install_merge_tool is defined and
+          git_install_merge_tool
+  - name: Install git and dependencies
+    ansible.builtin.package:
+      name: "{{ item }}"
+      state: present
+    with_items: "{{ _git_package_names }}"
 
 - name: Configure git
-  include_tasks: git_user.yml
+  ansible.builtin.include_tasks: git_user.yml
   with_dict:
-  - "{{ git_users }}"
+  - "{{ git_users }}"

templates/.config/git/allowedSignersFile.j2

@@ -0,0 +1,9 @@
+#
+# {{ ansible_managed }}
+#
+
+{% if item.value.allowedSignersFile is defined and item.value.allowedSignersFile | length > 0%}
+{% for entry in item.value.allowedSignersFile %}
+{{ entry.principals | join(',') }} {{ entry.publicSSHKey }}
+{% endfor %}
+{% endif %}

templates/.config/git/revocationFile.j2

@@ -0,0 +1,9 @@
+#
+# {{ ansible_managed }}
+#
+
+{% if item.value.revocationFile is defined and item.value.revocationFile | length > 0%}
+{% for entry in item.value.revocationFile %}
+{{ entry }}
+{% endfor %}
+{% endif %}