Merge pull request #4 from DO1JLR/cleanup

Change license link in README and change Author

.chglog/config.yml

@@ -1,3 +1,4 @@
+---
 style: github
 template: CHANGELOG.tpl.md
 info:

.github/workflows/galaxy.yml

@@ -1,22 +1,20 @@
 ---
-name: 🌌 Galaxy import
+name: Galaxy release
 
+# yamllint disable-line rule:truthy
 on:
   push:
-    branches:
-      - master
+    branches: ['main']
   release:
-    types:
-      - published
+    types: ['created']
 
 jobs:
-  import:
-    name: 🚀 Galaxy Action
+  build:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
         uses: actions/checkout@v2
       - name: galaxy
-        uses: robertdebock/galaxy-action@1.1.1
+        uses: robertdebock/galaxy-action@1.1.0
         with:
-          galaxy_api_key: ${{ secrets.GALAXY_API_KEY }}
+          galaxy_api_key: ${{ secrets.galaxy_api_key }}

.github/workflows/test.yml

@@ -1,5 +1,6 @@
 ---
 name: 🎭 Tests
+# yamllint disable-line rule:truthy
 on:
   push:
     paths:

.gitignore

@@ -1 +1,2 @@
-.DS_Store
+.cache
+.DS_Store

.yamllint

@@ -0,0 +1,8 @@
+---
+extends: default
+
+rules:
+  # 150 chars should be enough, but don't fail if a line is longer
+  line-length:
+    max: 150
+    level: warning

LICENSE

@@ -0,0 +1,22 @@
+MIT License
+
+Copyright (c) 2019, Arillso
+Copyright (c) 220 L3D <l3d@c3woc.de>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -187,14 +187,7 @@ none
     - restic
 ```
 
-## Author
-
-- Matthias Leutenegger
-
 ## License
 
-This project is under the MIT License. See the [LICENSE](https://sbaerlo.ch/licence) file for the full license text.
+This project is under the MIT License. See the [LICENSE](LICENSE) file for the full license text.
 
-## Copyright
-
-(c) 2019, Arillso

meta/main.yml

@@ -1,33 +1,21 @@
 ---
 galaxy_info:
   role_name: restic
-  author: Matthias Leutenegger
-  description: Role to deploy restic and setup backups.
-  # company:
+  author: do1jlr
+  description: Ansible role to deploy restic and setup backups.
   license: MIT
-  min_ansible_version: 2.8
+  min_ansible_version: 2.9
   platforms:
-    - name: EL
-      versions:
-        - 6
-        - 7
-    - name: Fedora
-      versions:
-        - 29
-    - name: Ubuntu
-      versions:
-        - bionic
-        - cosmic
     - name: Debian
-      versions:
-        - jessie
-        - stretch
-        - buster
-        # - name: Windows
-        #   versions:
-        #     - all
-
+      versions: all
+    - name: EL
+      versions: all
+    - name: Fedora
+      versions: all
+    - name: Ubuntu
+      versions: all
   galaxy_tags:
     - backup
+    - restic
 
 dependencies: []

molecule/default/test_restic/tasks/test_access_files.yml

@@ -1,18 +1,18 @@
 ---
-  - name: Stat test access file
-    stat:
-      path: ~/restic/access-test.sh
-    register: test_file
-  - name: Check that the test access file exists
-    assert:
-      that:
-        - test_file.stat.exists
+- name: Stat test access file
+  stat:
+    path: ~/restic/access-test.sh
+  register: test_file
+- name: Check that the test access file exists
+  assert:
+    that:
+      - test_file.stat.exists
 
-  - name: Stat test_stdin access file
-    stat:
-      path: ~/restic/access-test_stdin.sh
-    register: test_stdin_file
-  - name: Check that the test_stdin access file exists
-    assert:
-      that:
-        - test_stdin_file.stat.exists
+- name: Stat test_stdin access file
+  stat:
+    path: ~/restic/access-test_stdin.sh
+  register: test_stdin_file
+- name: Check that the test_stdin access file exists
+  assert:
+    that:
+      - test_stdin_file.stat.exists

molecule/default/test_restic/tasks/test_backup_files.yml

@@ -1,27 +1,27 @@
 ---
-  - name: Stat test backup file
-    stat:
-      path: ~/restic/backup-test.sh
-    register: test_file
-  - name: Check that the test backup file exists
-    assert:
-      that:
-        - test_file.stat.exists
+- name: Stat test backup file
+  stat:
+    path: ~/restic/backup-test.sh
+  register: test_file
+- name: Check that the test backup file exists
+  assert:
+    that:
+      - test_file.stat.exists
 
-  - name: Stat test_stdin backup file
-    stat:
-      path: ~/restic/backup-test_stdin.sh
-    register: test_stdin_file
-  - name: Check that the test_stdin backup file exists
-    assert:
-      that:
-        - test_stdin_file.stat.exists
+- name: Stat test_stdin backup file
+  stat:
+    path: ~/restic/backup-test_stdin.sh
+  register: test_stdin_file
+- name: Check that the test_stdin backup file exists
+  assert:
+    that:
+      - test_stdin_file.stat.exists
 
-  - name: Run the backup scripts
-    shell: "./{{ item }}"
-    args:
-      chdir: ~/restic/
-    with_items:
-      - backup-dicttest.sh
-      - backup-test.sh
-      - backup-test_stdin.sh
+- name: Run the backup scripts
+  shell: "./{{ item }}"
+  args:
+    chdir: ~/restic/
+  with_items:
+    - backup-dicttest.sh
+    - backup-test.sh
+    - backup-test_stdin.sh

molecule/default/test_restic/tasks/test_restic_link.yml

@@ -1,9 +1,9 @@
 ---
-  - name: Stat test restic link
-    stat:
-      path: ~/restic/restic
-    register: restic_link
-  - name: Check that the test restic link exists
-    assert:
-      that:
-        - restic_link.stat.exists
+- name: Stat test restic link
+  stat:
+    path: ~/restic/restic
+  register: restic_link
+- name: Check that the test restic link exists
+  assert:
+    that:
+      - restic_link.stat.exists

tasks/main.yml

@@ -1,27 +1,6 @@
 ---
-# tasks file for skeleton
-
 - name: add OS specific variables
-  include_vars: '{{ loop_vars }}'
-  with_first_found:
-    - files:
-        - '{{ distribution }}-{{ distribution_version }}.yml'
-        - '{{ distribution }}-{{ distribution_major_version }}.yml'
-        - '{{ distribution }}.yml'
-        - '{{ ansible_os_family }}.yml'
-        - '{{ ansible_system }}.yml'
-        - 'defaults.yml'
-      paths:
-        - 'vars'
-  loop_control:
-    loop_var: loop_vars
-  vars:
-    distribution: '{{ ansible_distribution }}'
-    distribution_version: '{{ ansible_distribution_version }}'
-    distribution_major_version: '{{ ansible_distribution_major_version }}'
-  tags:
-    - configuration
-    - packages
+  ansible.builtin.include_vars: "{{ lookup('first_found', restic_os_variables) }}"
 
 - name: Ensure restic directories exist
   file:

vars/main.yml

@@ -0,0 +1,11 @@
+---
+restic_os_variables:
+  files:
+    - '{{ ansible_distribution }}-{{ ansible_distribution_version }}.yml'
+    - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml'
+    - '{{ ansible_distribution }}.yml'
+    - '{{ ansible_os_family }}.yml'
+    - '{{ ansible_system }}.yml'
+    - 'defaults.yml'
+  paths:
+    - 'vars'