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/meta/main.yaml b/meta/main.yaml index 38a55f4..4ad52ff 100644 --- a/meta/main.yaml +++ b/meta/main.yaml @@ -5,4 +5,8 @@ galaxy_info: description: "install and configure an pangolin server" license: "MIT" role_name: "pangolin" -dependencies: [] +dependencies: + - name: "docker" + src: "https://gitlab.simoncor.net/ansible/ans-docker.git" + scm: "git" + version: "main" diff --git a/playbook.yaml b/playbook.yaml deleted file mode 100644 index b0aad68..0000000 --- a/playbook.yaml +++ /dev/null @@ -1,26 +0,0 @@ ---- - -# execute this role -- name: "install and configure Pangolin" - hosts: "all" - become: true - tasks: - - # due to semaphore bug we need to do this ourselves - - name: "force-update requirements" - ansible.builtin.command: - cmd: "ansible-galaxy install -f -r roles/requirements.yml" - become: false - delegate_to: "localhost" - changed_when: false - failed_when: false - - # execute the role - - name: "execute role: docker" - ansible.builtin.include_role: - name: "docker" - - # execute the role - - name: "execute role: pangolin" - ansible.builtin.include_role: - name: "pangolin" diff --git a/readme.md b/readme.md index 36ff185..121b342 100644 --- a/readme.md +++ b/readme.md @@ -1,3 +1,3 @@ # Ansible Role: Pangolin -Install and configure [Pangolin](https://digpangolin.com/) - a tunneled reverse proxy for homelabs. +Install and configure [Pangolin](https://digpangolin.com/) - a serverless web analytics tool. diff --git a/roles/requirements.yml b/roles/requirements.yml deleted file mode 100644 index 388cccc..0000000 --- a/roles/requirements.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- - -roles: - - name: "docker" - src: "https://git.simoncor.net/ansible/docker.git" - scm: "git" - - name: "pangolin" - src: "https://git.simoncor.net/ansible/pangolin.git" - scm: "git" diff --git a/tasks/pangolin.yaml b/tasks/pangolin.yaml index a738b24..e9fdff6 100644 --- a/tasks/pangolin.yaml +++ b/tasks/pangolin.yaml @@ -29,7 +29,7 @@ pull: "always" state: "started" name: "pangolin" - image: "cr.simoncor.net/dockerhub/fosrl/pangolin:1.18.4" + image: "docker.io/fosrl/pangolin:1.18.1" restart_policy: "unless-stopped" networks: - name: "pangolin" @@ -62,7 +62,7 @@ pull: "always" state: "started" name: "traefik" - image: "cr.simoncor.net/dockerhub/library/traefik:v3.7.0" + image: "docker.io/library/traefik:v3.6" restart_policy: "unless-stopped" networks: - name: "pangolin"