Merge pull request #1 from derFreitag/refactor

Major update on the syntax and CI!

Author: gforcada

.github/workflows/ci.yml

@@ -0,0 +1,67 @@
+name: CI
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - main
+
+jobs:
+
+  yaml:
+    name: YAML lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+
+      - name: Install dependencies
+        run: pip3 install yamllint
+
+      - name: Lint the code
+        run: |
+          yamllint */*.yml
+
+  playbook:
+    name: ansible-playbook lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+
+      - name: Install dependencies
+        run: pip3 install ansible
+
+      - name: Lint
+        run: |
+          ansible-galaxy role install geerlingguy.ntp
+          ansible-playbook --syntax-check ansible.yml
+
+  ansible-lint:
+    name: ansible-lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.x'
+
+      - name: Install dependencies
+        run: pip3 install ansible-lint
+
+      - name: Lint
+        run: |
+          ansible-lint .

.gitignore

@@ -0,0 +1 @@
+venv

README.md

@@ -1,29 +1,31 @@
-freitag.base
-============
+# freitag.base
+
 Ansible role to install system wide utilities.
 
-Requirements
-------------
+## Requirements
+
 None
 
-Role Variables
---------------
+## Role Variables
+
 None
 
-Dependencies
-------------
+## Dependencies
+
 Depends on ``geerlingguy.ntp``.
 
-Example Playbook
-----------------
+## Example Playbook
+
+```yml
     - hosts: servers
       roles:
          - { role: freitag.base  }
+```
+
+## License
 
-License
--------
 GPLv3
 
-Author Information
-------------------
+## Author Information
+
 Gil Forcada Codinachs (der Freitag)

ansible.cfg

@@ -0,0 +1,2 @@
+[defaults]
+roles_path = ..

ansible.yml

@@ -0,0 +1,4 @@
+---
+- hosts: all
+  roles:
+    - freitag.base

meta/main.yml

@@ -1,15 +1,20 @@
+---
+
+dependencies:
+  - role: geerlingguy.ntp
+
 galaxy_info:
-  author: Gil Forcada
-  description: Ansible role to install system wide utilities
+  author: Gil Forcada Codinachs
+  description: Install system wide utilities
   company: der Freitag
+  role_name: base
+  namespace: freitag
   license: license (GPLv3)
-  min_ansible_version: 2.1
+  min_ansible_version: '2.2'
   platforms:
     - name: Ubuntu
       versions:
-        - xenial
+        - jammy
   galaxy_tags:
     - system
     - development
-dependencies:
-  - { role: geerlingguy.ntp, ntp_timezone: Europe/Berlin }

tasks/main.yml

@@ -1,14 +1,14 @@
 ---
 
 - name: Update
-  become: yes
-  apt:
-    update_cache=yes
+  become: true
+  ansible.builtin.apt:
+    update_cache: true
 
 - name: Install system dependencies
-  become: yes
-  apt:
-    name: "{{item}}"
+  become: true
+  ansible.builtin.apt:
+    name: "{{ item }}"
     state: present
   with_items:
     - vim
@@ -19,14 +19,12 @@
     - strace
 
 - name: Install German locale
-  become: yes
-  locale_gen:
-    name=de_DE.UTF-8
-    state=present
+  become: true
+  community.general.locale_gen:
+    name: de_DE.UTF-8
+    state: present
 
-# XXX use the newer synatx on ansible >= 2.2.0
 - name: Set timezone to Europe/Berlin
-  become: yes
-  shell: timedatectl set-timezone Europe/Berlin
-#  timezone:
-#    name=Europe/Berlin
+  become: true
+  community.general.timezone:
+    name: Europe/Berlin

vars/main.yml

@@ -0,0 +1,3 @@
+---
+
+ntp_timezone: Europe/Berlin