Add Manjaro support (by @verbumfeit), CI fixes. (borgbase#65)

Co-authored-by: verbumfeit <[email protected]>

Author: m3nu

.github/workflows/main.yml

@@ -12,10 +12,10 @@ jobs:
       with:
         python-version: 3.7
     - name: Install Molecule
-      run: pip install molecule[lint,docker]
-    - name: Lint
       run: |
-        yamllint .
-        ansible-lint
+        pip install -U pip setuptools wheel
+        pip install -r requirements-dev.txt
+    # - name: Debugging with tmate
+    #   uses: mxschmitt/[email protected]
     - name: Test using Molecule
       run: molecule test

.yamllint

@@ -1,5 +1,8 @@
 ---
 # Based on ansible-lint config
+ignore: |
+  .direnv
+
 extends: default
 
 rules:

README.md

@@ -17,7 +17,7 @@ Main features:
 ```
 - hosts: webservers
   roles:
-  - role: borgbackup
+  - role: m3nu.ansible_role_borgbackup
     borg_encryption_passphrase: CHANGEME
     borg_repository: [email protected]:repo
     borg_source_directories:
@@ -44,7 +44,7 @@ $ ansible-galaxy install m3nu.ansible_role_borgbackup
 Clone to local folder
 
 ```
-$ git clone https://github.com/borgbase/ansible-role-borgbackup.git roles/borgbackup
+$ git clone https://github.com/borgbase/ansible-role-borgbackup.git roles/ansible_role_borgbackup
 ```
 
 

meta/main.yml

@@ -3,6 +3,8 @@ dependencies: []
 
 galaxy_info:
   author: Manuel Riel
+  role_name: ansible_role_borgbackup
+  namespace: m3nu
   description: Set up backup to remote machine using Borg and Borgmatic.
   company: "BorgBase.com"
   license: license (BSD, MIT)

molecule/default/converge.yml

@@ -7,7 +7,7 @@
         name: openssh-server
         state: present
   roles:
-    - role: ansible-role-borgbackup
+    - role: m3nu.ansible_role_borgbackup
       borg_encryption_passphrase: CHANGEME
       borg_repository: [email protected]:repo
       borg_source_directories:

molecule/default/molecule.yml

@@ -10,10 +10,6 @@ platforms:
     image: centos:latest
   - name: fedora-latest
     image: fedora:latest
-  - name: fedora-31
-    image: fedora:31
-  - name: debian-oldstable
-    image: debian:oldstable
   - name: debian-stable
     image: debian:stable
   - name: ubuntu-bionic
@@ -24,3 +20,7 @@ provisioner:
   name: ansible
 verifier:
   name: ansible
+lint: |
+  set -e
+  yamllint .
+  ansible-lint .

requirements-dev.txt

@@ -1,3 +1,3 @@
-molecule[lint,docker]
+ansible
 ansible-lint
-testinfra
+molecule[lint,docker]

tasks/RedHat.yml

@@ -1,7 +1 @@
 ---
-- name: Install EPEL repo
-  yum:
-    pkg: epel-release
-    state: installed
-    update_cache: yes
-  when: ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat Enterprise Linux'

tasks/main.yml

@@ -6,8 +6,9 @@
     - "{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml"
     - "{{ ansible_distribution }}.yml"
     - "{{ ansible_os_family }}.yml"
+    - "{{ ansible_lsb.id }}.yml"
 
-- name: Run OS-specific setup
+- name: Run OS-specific tasks
   include: "{{ item }}"
   with_first_found:
     - "{{ ansible_os_family }}-{{ ansible_distribution_major_version }}.yml"
@@ -39,7 +40,8 @@
     ssh_key_type: ed25519
   register: root_user
 
-- debug:
+- name: Print key created for root user (use for remote repo)
+  debug:
     var: root_user['ssh_public_key']
 
 - name: Create new repository for server

vars/ManjaroLinux.yml

@@ -0,0 +1,8 @@
+---
+borg_packages:
+  - borgmatic
+  - openssh
+  - cronie
+
+python_bin: python3
+pip_bin: pip3