diff --git a/.ansible-lint b/.ansible-lint index dce6ce0..01125b7 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -13,6 +13,7 @@ exclude_paths: - .cache/ # implicit unless exclude_paths is defined in config - test/fixtures/formatting-before/ - test/fixtures/formatting-prettier/ + - .ansible/collections # parseable: true # quiet: true # strict: true diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b5d58b1..1f0c289 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,7 @@ jobs: run: | exit_code=0 expected_exit_code=0 - ansible-lint || exit_code=$? + ansible-lint --ignore-file .ansible-lint-ignore --config-file .ansible-lint . || exit_code=$? if [ "$exit_code" != "$expected_exit_code" ]; then echo "Command failed: got '$exit_code', expected '$expected_exit_code'"; exit 1; fi molecule: diff --git a/README.md b/README.md index 4cd6d33..b1cda02 100644 --- a/README.md +++ b/README.md @@ -13,26 +13,30 @@ None. ## Role install -``` +```bash ansible-galaxy role install bulch.rsync_server ``` ## Role Variables -Default varibles +Default varibles in file [defaults/main.yml](defaults/main.yml) -``` +```yaml +--- +# defaults file for rsync_server rsync_config_file: "/etc/rsyncd.conf" rsync_config_port: 873 rsync_server_timeout: 300 rsync_server_max_connections: 2 +rsync_packages: + - rsync rsync_config_manage: [] ``` ## Example Playbook -``` +```yaml --- - name: Example Playbook hosts: all @@ -49,14 +53,14 @@ rsync_config_manage: [] - rsync_server vars: rsync_config_manage: - - name: "example-storage" - configs: - comment: "Example storage" - path: "/var/www/example-storage" - hosts_allow: ["*"] - secrets: - user: "{{ my_secter_rsync_user }}" - password: "{{ my_secter_rsync_password }}" + - name: "example-storage" + configs: + comment: "Example storage" + path: "/var/www/example-storage" + hosts_allow: ["*"] + secrets: + user: "{{ my_secter_rsync_user }}" + password: "{{ my_secter_rsync_password }}" ``` Rsync list for test diff --git a/ansible-lint.yaml b/ansible-lint.yaml new file mode 100644 index 0000000..5a2a866 --- /dev/null +++ b/ansible-lint.yaml @@ -0,0 +1,14 @@ +--- + +skip_list: + - 'var-naming' + - 'no-handler' + - '503' # no-handler code + - 'role-name' + - '106' + - 'ignore-errors' + - 'yaml' + - '204' # line length => checked by yamllint + - 'name[template]' + - 'run-once[play]' # only used in molecule + - 'run-once[task]' # only used in molecule diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index 056575d..6427f5a 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -1,6 +1,11 @@ --- - name: Fail if molecule group is missing hosts: localhost + vars: + molecule_inventory: + all: + hosts: {} + molecule: {} tasks: - name: Print some info ansible.builtin.debug: diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 9eb63e2..7ebda52 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -40,4 +40,4 @@ verifier: lint: | set -e yamllint . - ansible-lint . + ansible-lint diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml index 3ca5bba..ebdf025 100644 --- a/molecule/default/verify.yml +++ b/molecule/default/verify.yml @@ -1,6 +1,11 @@ --- - name: Fail if molecule group is missing hosts: localhost + vars: + molecule_inventory: + all: + hosts: {} + molecule: {} tasks: - name: Print some info ansible.builtin.debug: diff --git a/requirements.yml b/requirements.yml index 96d83fb..8e7fccc 100755 --- a/requirements.yml +++ b/requirements.yml @@ -1,6 +1,3 @@ --- roles: [] -collections: - - name: community.docker - version: ">=3.10.4" - - name: community.general +collections: [] diff --git a/templates/etc-rsyncd.conf.j2 b/templates/etc-rsyncd.conf.j2 index 76644f9..27aead6 100644 --- a/templates/etc-rsyncd.conf.j2 +++ b/templates/etc-rsyncd.conf.j2 @@ -10,7 +10,7 @@ {% for item in rsync_config_manage | default([]) %} [{{ item.name }}] path = {{ item.configs.path }} - comment = {{ item.configs.comment | default("{{ item.name }} - server rsync") }} + comment = {{ item.configs.comment | default(item.name + " - server rsync") }} auth users = {{ item.secrets.user }} uid = {{ item.configs.uid | default('nobody') }} gid = {{ item.configs.gid | default('nogroup') }}