diff --git a/.ansible-lint b/.ansible-lint index 2b580a2..9b9b52a 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -3,7 +3,6 @@ exclude_paths: - ".gitlab/*" - ".gitlab-ci.yml" - - ".woodpecker/*" - "defaults/main.yaml" - "meta/main.yaml" - "vars/*" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..7ec2c37 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,13 @@ +--- + +# gitlab stages +stages: + - "gitleaks" + - "linting" + +# include components +include: + - component: "$CI_SERVER_FQDN/components/ansible/linting@v3.0.3" + - component: "$CI_SERVER_FQDN/components/gitleaks/gitleaks@v1.0.0" + - component: "$CI_SERVER_FQDN/components/markdownlint/markdownlint@1.0.0" + - component: "$CI_SERVER_FQDN/components/yamllint/yamllint@1.0.2" diff --git a/.markdownlint-cli2.jsonc b/.markdownlint-cli2.jsonc index a4ea90f..56cd87c 100644 --- a/.markdownlint-cli2.jsonc +++ b/.markdownlint-cli2.jsonc @@ -6,8 +6,7 @@ // linting rules "config": { "MD013": { - "line_length": 120, - "tables": false + "line_length": 120 } } } diff --git a/.woodpecker/linting.yml b/.woodpecker/linting.yml deleted file mode 100644 index 02cf4c2..0000000 --- a/.woodpecker/linting.yml +++ /dev/null @@ -1,41 +0,0 @@ ---- -when: - - event: "push" - branch: "main" - - event: "manual" - -steps: - - # gitleaks - - name: "gitleaks" - # renovate: datasource=github-releases depName=gitleaks/gitleaks - image: "cr.simoncor.net/ghcr/gitleaks/gitleaks:v8.30.1" - commands: - - "gitleaks detect --source . --verbose --redact" - - # yamllint - - name: "yamllint" - # renovate: datasource=docker depName=cr.simoncor.net/yamllint - image: "cr.simoncor.net/yamllint:1.38.0" - depends_on: - - "gitleaks" - commands: - - "yamllint -c .yamllint ." - - # ansible-lint - - name: "ansible-lint" - # renovate: datasource=docker depName=docker.io/pipelinecomponents/ansible-lint - image: "cr.simoncor.net/dockerhub/pipelinecomponents/ansible-lint:0.79.11" - depends_on: - - "gitleaks" - commands: - - "ansible-lint -c .ansible-lint ." - - # markdownlint - - name: "markdownlint" - # renovate: datasource=docker depName=docker.io/davidanson/markdownlint-cli2 - image: "cr.simoncor.net/dockerhub/davidanson/markdownlint-cli2:v0.22.1" - depends_on: - - "gitleaks" - commands: - - "markdownlint-cli2 --config .markdownlint-cli2.jsonc" diff --git a/defaults/main.yaml b/defaults/main.yaml index bb7d9ee..fe03e9f 100644 --- a/defaults/main.yaml +++ b/defaults/main.yaml @@ -1,7 +1,7 @@ --- # renovate: datasource=github-releases depName=atuinsh/atuin versioning=pep440 -atuin_version: "18.16.1" +atuin_version: "18.13.5" # atuin db creds atuin_db_host: "localhost" diff --git a/readme.md b/readme.md index 02f1b8f..d53818e 100644 --- a/readme.md +++ b/readme.md @@ -1,23 +1,13 @@ -# Ansible Role: Atuin +# Overview -Install and configure [Atuin](https://atuin.sh/) - a shell history sync server. +This role configures [Atuin]() server, for reasons. -## Variables +## Supported Operating Systems -| Variable | Required | Default | Description | -| --------------- | -------- | ----------- | ------------------------ | -| `atuin_version` | No | `18.13.6` | Atuin version to install | -| `atuin_db_host` | No | `localhost` | Database host | -| `atuin_db_name` | No | `atuin` | Database name | -| `atuin_db_user` | No | `atuin` | Database user | -| `atuin_db_pass` | Yes | `atuin` | Database password | +| Operating System | Version | +| --- | ----- | +| Debian | 13 | -## Example +## Tags -```yaml -atuin_version: "18.13.6" -atuin_db_host: "localhost" -atuin_db_name: "atuin" -atuin_db_user: "atuin" -atuin_db_pass: "secure_password" -``` +This role has no tags. diff --git a/roles/requirements.yml b/roles/requirements.yml index 582120e..0a2625d 100644 --- a/roles/requirements.yml +++ b/roles/requirements.yml @@ -2,5 +2,5 @@ roles: - name: "atuin" - src: "https://git.simoncor.net/ansible/atuin.git" + src: "https://gitlab.simoncor.net/ansible/ans-atuin.git" scm: "git" diff --git a/tasks/install.yaml b/tasks/install.yaml index b0f5aee..24bf37d 100644 --- a/tasks/install.yaml +++ b/tasks/install.yaml @@ -1,52 +1,22 @@ --- -# check current atuin server version -- name: "check current atuin server version" +# check current atuin version +- name: "check current version" ansible.builtin.shell: cmd: "/usr/local/bin/atuin-server --version" changed_when: false failed_when: false - register: "atuin_server_version_check" + register: "atuin_version_check" -# check current atuin client version -- name: "check current atuin client version" - ansible.builtin.shell: - cmd: "/usr/local/bin/atuin --version" - changed_when: false - failed_when: false - register: "atuin_client_version_check" - -# delete current atuin client -- name: "delete current client" - ansible.builtin.file: - path: "/usr/local/bin/atuin" - state: "absent" - when: "atuin_version not in atuin_client_version_check.stdout" - -# delete current atuin server -- name: "delete current server" +# delete current atuin version +- name: "delete current version" ansible.builtin.file: path: "/usr/local/bin/atuin-server" state: "absent" - when: "atuin_version not in atuin_server_version_check.stdout" + when: "atuin_version not in atuin_version_check.stdout" -# install atuin client -- name: "install atuin client" - ansible.builtin.unarchive: - src: - "https://github.com/atuinsh/atuin/releases/download/\ - v{{ atuin_version }}/atuin-x86_64-unknown-linux-gnu.tar.gz" - dest: "/usr/local/bin/" - include: "atuin-x86_64-unknown-linux-gnu/atuin" - extra_opts: ["--strip-components=1"] - owner: "root" - group: "root" - mode: "0755" - remote_src: true - when: "atuin_version not in atuin_client_version_check.stdout" - -# install atuin server -- name: "install atuin server" +# install atuin +- name: "install atuin" ansible.builtin.unarchive: src: "https://github.com/atuinsh/atuin/releases/download/\ @@ -59,7 +29,7 @@ mode: "0755" remote_src: true notify: "restart atuin" - when: "atuin_version not in atuin_server_version_check.stdout" + when: "atuin_version not in atuin_version_check.stdout" # install systemd service - name: "install service"