diff --git a/.github/workflows/ansible-linting-check.yml b/.github/workflows/ansible-linting-check.yml index 747f22a..e442afc 100644 --- a/.github/workflows/ansible-linting-check.yml +++ b/.github/workflows/ansible-linting-check.yml @@ -13,11 +13,10 @@ jobs: - name: 'checkout git repo' uses: actions/checkout@v4 with: - lfs: true submodules: true fetch-depth: 0 - name: Run ansible-lint - uses: ansible-actions/ansible-lint-action@v0.0.3 + uses: ansible-actions/ansible-lint-action@v1.0.1 with: target: "./" diff --git a/.github/workflows/galaxy.yml b/.github/workflows/galaxy.yml index 4426496..af41c1c 100644 --- a/.github/workflows/galaxy.yml +++ b/.github/workflows/galaxy.yml @@ -1,22 +1,24 @@ --- -name: Galaxy release +name: Galaxy-NG Roles Import # yamllint disable-line rule:truthy on: - push: - branches: ['main'] release: types: ['created'] jobs: build: + name: Jinja2 Linting runs-on: ubuntu-latest - steps: - - name: 'checkout git repo' - uses: actions/checkout@v4 - - name: 'release on galaxy' - uses: robertdebock/galaxy-action@1.2.1 + steps: + - name: 'Checkout git repo' + uses: actions/checkout@v4 with: - galaxy_api_key: ${{ secrets.galaxy_api_key }} - git_branch: 'main' + submodules: true + fetch-depth: 0 + + - name: 'Release on galaxy' + uses: ansible-actions/ansible-galaxy-action@v1.0.0 + with: + galaxy_api_key: ${{ secrets.galaxy_api_key } diff --git a/.github/workflows/j2lint-check.yml b/.github/workflows/j2lint-check.yml new file mode 100644 index 0000000..5037de5 --- /dev/null +++ b/.github/workflows/j2lint-check.yml @@ -0,0 +1,22 @@ +--- +name: Jinja2 Linting check + +# yamllint disable-line rule:truthy +on: [push, pull_request] + +jobs: + build: + name: Jinja2 Linting + runs-on: ubuntu-latest + + steps: + - name: 'checkout git repo' + uses: actions/checkout@v4 + with: + submodules: true + fetch-depth: 0 + + - name: Run j2lint + uses: ansible-actions/j2lint-action@v0.0.1 + with: + target: "./" diff --git a/.github/workflows/yamllint-check.yml b/.github/workflows/yamllint-check.yml new file mode 100644 index 0000000..751e992 --- /dev/null +++ b/.github/workflows/yamllint-check.yml @@ -0,0 +1,22 @@ +--- +name: Yamllint check + +# yamllint disable-line rule:truthy +on: [push, pull_request] + +jobs: + build: + name: Yamllint + runs-on: ubuntu-latest + + steps: + - name: 'checkout git repo' + uses: actions/checkout@v4 + with: + submodules: true + fetch-depth: 0 + + - name: Run yamllint + uses: ansible-actions/yamllint-action@v0.0.1 + with: + target: "./" diff --git a/.github/workflows/yamllint.yaml b/.github/workflows/yamllint.yaml deleted file mode 100644 index 99bb4c4..0000000 --- a/.github/workflows/yamllint.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -name: 'Yamllint GitHub Actions' - -# yamllint disable-line rule:truthy -on: - push: - branches: '*' - pull_request: - branches: '*' - -jobs: - yamllint: - name: 'Yamllint' - runs-on: ubuntu-latest - steps: - - name: 'checkout git repo' - uses: actions/checkout@v4 - - - name: 'Yamllint' - uses: karancode/yamllint-github-action@v2.1.1 - with: - yamllint_file_or_dir: '.' - yamllint_config_filepath: './.yamllint' diff --git a/README.md b/README.md index a595aca..b6626d8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Ansible Galaxy](https://ansible.l3d.space/svg/l3d.etebase.svg)](https://galaxy.ansible.com/ui/standalone/roles/roles-ansible/etebase/) +[![Ansible Galaxy](https://ansible.l3d.space/svg/l3d.etebase.svg)](https://galaxy.ansible.com/ui/standalone/roles/l3d/etebase/) [![MIT License](https://ansible.l3d.space/svg/l3d.etebase_license.svg)](LICENSE) [![Maintainance](https://ansible.l3d.space/svg/l3d.etebase_maintainance.svg)](https://ansible.l3d.space/#l3d.etebase) diff --git a/templates/etebase-server.ini.j2 b/templates/etebase-server.ini.j2 index 7479a3e..4067bdc 100644 --- a/templates/etebase-server.ini.j2 +++ b/templates/etebase-server.ini.j2 @@ -3,7 +3,7 @@ [global] secret_file = {{ etebase__global_secret_file }} -debug = {{ etebase__global_debug | ternary('true', 'false') }} +debug = {{ etebase__global_debug | ternary('true', 'false') }} ;Set the paths where data will be stored at static_root = {{ etebase__global_static_root }} media_root = {{ etebase__global_media_root }}