From 8ce3f049257c45a5f75513b009f4a83467d5c574 Mon Sep 17 00:00:00 2001
From: L3D <l3d@c3woc.de>
Date: Tue, 19 Jan 2021 01:03:47 +0100
Subject: [PATCH] add versionscheck and fix linting

---
 .github/FUNDING.yml                          |   6 +
 .github/license.svg                          | 217 +++++++++++++++++++
 .github/workflows/ansible-debian-buster.yml  |  18 ++
 .github/workflows/ansible-debian-latest.yml  |  18 ++
 .github/workflows/ansible-debian-sid.yml     |  18 ++
 .github/workflows/ansible-debian-stable.yml  |  18 ++
 .github/workflows/ansible-debian-stretch.yml |  18 ++
 .github/workflows/ansible-linting-check.yml  |  22 ++
 .github/workflows/ansible-ubuntu-bionic.yml  |  18 ++
 .github/workflows/ansible-ubuntu-latest.yml  |  18 ++
 .github/workflows/ansible-ubuntu-trusty.yml  |  18 ++
 .github/workflows/yamllint.yaml              |  22 ++
 .yamllint                                    |   8 +
 defaults/main.yml                            |   2 +
 handlers/main.yml                            |   7 +-
 tasks/main.yml                               |   4 +-
 tasks/versioncheck.yml                       |   2 +-
 vars/main.yml                                |   2 +-
 18 files changed, 428 insertions(+), 8 deletions(-)
 create mode 100644 .github/FUNDING.yml
 create mode 100644 .github/license.svg
 create mode 100644 .github/workflows/ansible-debian-buster.yml
 create mode 100644 .github/workflows/ansible-debian-latest.yml
 create mode 100644 .github/workflows/ansible-debian-sid.yml
 create mode 100644 .github/workflows/ansible-debian-stable.yml
 create mode 100644 .github/workflows/ansible-debian-stretch.yml
 create mode 100644 .github/workflows/ansible-linting-check.yml
 create mode 100644 .github/workflows/ansible-ubuntu-bionic.yml
 create mode 100644 .github/workflows/ansible-ubuntu-latest.yml
 create mode 100644 .github/workflows/ansible-ubuntu-trusty.yml
 create mode 100644 .github/workflows/yamllint.yaml
 create mode 100644 .yamllint

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000..8f96dfd
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,6 @@
+---
+# Feel free to add yourself if you maintain this repo
+# or participate in a way that you have the feeling that you belong there ;-)
+
+github: [do1jlr]
+liberapay: L3D
diff --git a/.github/license.svg b/.github/license.svg
new file mode 100644
index 0000000..4ab6d9a
--- /dev/null
+++ b/.github/license.svg
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="83.946869"
+   height="20.137625"
+   version="1.1"
+   id="svg28"
+   sodipodi:docname="license.svg"
+   inkscape:version="0.92.4 5da689c313, 2019-01-14">
+  <metadata
+     id="metadata34">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <cc:license
+           rdf:resource="MIT (c) L3D &lt;l3d@c3woc.de&gt;" />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>3D &lt;l3d@c3woc.de&gt;</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>MIT License</dc:title>
+          </cc:Agent>
+        </dc:rights>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs32">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#b"
+       id="linearGradient4625"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.9067096,0,0,0.44280744,1.0963297e-6,-1e-6)"
+       x1="0"
+       y1="-0.28392482"
+       x2="0"
+       y2="45.166359" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#b"
+       id="linearGradient837"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.9067096,0,0,0.44280744,1.0963297e-6,-1e-6)"
+       x1="0"
+       y1="-0.28392482"
+       x2="0"
+       y2="45.166359" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#b"
+       id="linearGradient839"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.9067096,0,0,0.44280744,1.0963297e-6,-1e-6)"
+       x1="0"
+       y1="-0.28392482"
+       x2="0"
+       y2="45.166359" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1916"
+     inkscape:window-height="1152"
+     id="namedview30"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="7.5888761"
+     inkscape:cx="39.713668"
+     inkscape:cy="14.182162"
+     inkscape:window-x="2560"
+     inkscape:window-y="22"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg28"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <sodipodi:guide
+       position="47.649406,5.8374226"
+       orientation="0,1"
+       id="guide4567"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
+  <linearGradient
+     id="b"
+     x2="0"
+     y2="45.166359"
+     gradientTransform="scale(2.258318,0.44280744)"
+     x1="0"
+     y1="-0.28392482"
+     gradientUnits="userSpaceOnUse">
+    <stop
+       offset="0"
+       stop-color="#bbb"
+       stop-opacity=".1"
+       id="stop2" />
+    <stop
+       offset="1"
+       stop-opacity=".1"
+       id="stop4" />
+  </linearGradient>
+  <clipPath
+     id="a">
+    <rect
+       width="102"
+       height="20"
+       rx="3"
+       id="rect7"
+       x="0"
+       y="0"
+       style="fill:#ffffff" />
+  </clipPath>
+  <path
+     sodipodi:nodetypes="sccssss"
+     inkscape:connector-curvature="0"
+     id="path4637"
+     d="M 80.55806,0 H 48 v 20 h 32.55806 c 1.87153,0 3.378212,-1.506683 3.378212,-3.378212 V 3.3782117 C 83.936272,1.5066824 82.42959,0 80.55806,0 Z"
+     style="opacity:1;vector-effect:none;fill:#0055d4;fill-opacity:1;stroke:none;stroke-width:1.4740175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers" />
+  <path
+     style="opacity:1;vector-effect:none;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:1.4740175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers"
+     d="M 3.3782117,0 H 49.936272 V 20 H 3.3782117 C 1.5066824,20 0,18.493317 0,16.621788 V 3.3782117 C 0,1.5066824 1.5066824,0 3.3782117,0 Z"
+     id="rect4634"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="sccssss" />
+  <rect
+     ry="3.3782117"
+     y="0"
+     x="4.6019753e-15"
+     height="20.137625"
+     width="83.946869"
+     id="rect4641"
+     style="opacity:1;vector-effect:none;fill:url(#linearGradient837);fill-opacity:1;stroke:none;stroke-width:1.4740175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers" />
+  <rect
+     style="opacity:1;vector-effect:none;fill:url(#linearGradient839);fill-opacity:1;stroke:none;stroke-width:1.4740175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers"
+     id="rect833"
+     width="83.946869"
+     height="20.137625"
+     x="4.6019753e-15"
+     y="0"
+     ry="3.3782117" />
+  <rect
+     ry="3.3782117"
+     y="0"
+     x="4.6019753e-15"
+     height="20.137625"
+     width="83.946869"
+     id="rect835"
+     style="opacity:1;vector-effect:none;fill:url(#linearGradient4625);fill-opacity:1;stroke:none;stroke-width:1.4740175;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke fill markers" />
+  <g
+     id="g4591"
+     transform="translate(6.0000004,0.1778004)">
+    <text
+       id="text4551"
+       y="15.101547"
+       x="49.939278"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11px;line-height:normal;font-family:'DejaVu Sans', Verdana, Geneva, sans-serif;-inkscape-font-specification:'DejaVu Sans, Verdana, Geneva, sans-serif, Normal';font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;opacity:1;vector-effect:none;fill:#000000;fill-opacity:0.3;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       xml:space="preserve"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11px;line-height:normal;font-family:'DejaVu Sans', Verdana, Geneva, sans-serif;-inkscape-font-specification:'DejaVu Sans, Verdana, Geneva, sans-serif, Normal';font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;vector-effect:none;fill:#000000;fill-opacity:0.3;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         y="15.101547"
+         x="49.939278"
+         id="tspan4549"
+         sodipodi:role="line">MIT</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-weight:normal;font-size:40px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none"
+       x="59.774261"
+       y="14.119328"
+       id="text4547"><tspan
+         sodipodi:role="line"
+         id="tspan4545"
+         x="59.774261"
+         y="14.119328"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11px;font-family:'DejaVu Sans', Verdana, Geneva, sans-serif;-inkscape-font-specification:'DejaVu Sans, Verdana, Geneva, sans-serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ffffff">MIT</tspan></text>
+  </g>
+  <g
+     id="g4595"
+     transform="translate(3.9474745e-7,0.1778004)">
+    <text
+       x="245"
+       y="150"
+       transform="scale(0.1)"
+       textLength="370"
+       id="text18"
+       lengthAdjust="spacing"
+       style="font-size:110px;font-family:'DejaVu Sans', Verdana, Geneva, sans-serif;text-anchor:middle;fill:#010101;fill-opacity:0.3">license</text>
+    <text
+       x="245"
+       y="140"
+       transform="scale(0.1)"
+       textLength="370"
+       id="text20"
+       lengthAdjust="spacing"
+       style="font-size:110px;font-family:'DejaVu Sans', Verdana, Geneva, sans-serif;text-anchor:middle;fill:#ffffff">license</text>
+  </g>
+</svg>
diff --git a/.github/workflows/ansible-debian-buster.yml b/.github/workflows/ansible-debian-buster.yml
new file mode 100644
index 0000000..d76b02c
--- /dev/null
+++ b/.github/workflows/ansible-debian-buster.yml
@@ -0,0 +1,18 @@
+---
+name: Ansible check debian:buster
+
+# yamllint disable-line rule:truthy
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: ansible check with debian:buster
+        uses: roles-ansible/check-ansible-debian-buster-action@master
+        with:
+          targets: "./"
diff --git a/.github/workflows/ansible-debian-latest.yml b/.github/workflows/ansible-debian-latest.yml
new file mode 100644
index 0000000..f7eb5b6
--- /dev/null
+++ b/.github/workflows/ansible-debian-latest.yml
@@ -0,0 +1,18 @@
+---
+name: Ansible check debian:latest
+
+# yamllint disable-line rule:truthy
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: ansible check with debian:latest
+        uses: roles-ansible/check-ansible-debian-latest-action@master
+        with:
+          targets: "./"
diff --git a/.github/workflows/ansible-debian-sid.yml b/.github/workflows/ansible-debian-sid.yml
new file mode 100644
index 0000000..2e3215a
--- /dev/null
+++ b/.github/workflows/ansible-debian-sid.yml
@@ -0,0 +1,18 @@
+---
+name: Ansible check debian:sid
+
+# yamllint disable-line rule:truthy
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: ansible check with debian:sid
+        uses: roles-ansible/check-ansible-debian-sid-action@master
+        with:
+          targets: "./"
diff --git a/.github/workflows/ansible-debian-stable.yml b/.github/workflows/ansible-debian-stable.yml
new file mode 100644
index 0000000..e47f773
--- /dev/null
+++ b/.github/workflows/ansible-debian-stable.yml
@@ -0,0 +1,18 @@
+---
+name: Ansible check debian:stable
+
+# yamllint disable-line rule:truthy
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: ansible check with debian:stable
+        uses: roles-ansible/check-ansible-debian-stable-action@master
+        with:
+          targets: "./"
diff --git a/.github/workflows/ansible-debian-stretch.yml b/.github/workflows/ansible-debian-stretch.yml
new file mode 100644
index 0000000..c947cae
--- /dev/null
+++ b/.github/workflows/ansible-debian-stretch.yml
@@ -0,0 +1,18 @@
+---
+name: Ansible check debian:stretch
+
+# yamllint disable-line rule:truthy
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: ansible check with debian:stretch
+        uses: roles-ansible/check-ansible-debian-stretch-action@master
+        with:
+          targets: "./"
diff --git a/.github/workflows/ansible-linting-check.yml b/.github/workflows/ansible-linting-check.yml
new file mode 100644
index 0000000..41dcb97
--- /dev/null
+++ b/.github/workflows/ansible-linting-check.yml
@@ -0,0 +1,22 @@
+---
+name: Ansible Lint check
+
+# yamllint disable-line rule:truthy
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Lint Ansible Playbook
+        uses: ansible/ansible-lint-action@master
+        with:
+          targets: "."
+          # [required]
+          # Paths to ansible files (i.e., playbooks, tasks, handlers etc..)
+          args: ""
+          # [optional]
diff --git a/.github/workflows/ansible-ubuntu-bionic.yml b/.github/workflows/ansible-ubuntu-bionic.yml
new file mode 100644
index 0000000..0f9edd8
--- /dev/null
+++ b/.github/workflows/ansible-ubuntu-bionic.yml
@@ -0,0 +1,18 @@
+---
+name: Ansible check ubuntu:bionic
+
+# yamllint disable-line rule:truthy
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: ansible check with ubuntu:bionic
+        uses: roles-ansible/check-ansible-ubuntu-bionic-action@master
+        with:
+          targets: "./"
diff --git a/.github/workflows/ansible-ubuntu-latest.yml b/.github/workflows/ansible-ubuntu-latest.yml
new file mode 100644
index 0000000..b9544a5
--- /dev/null
+++ b/.github/workflows/ansible-ubuntu-latest.yml
@@ -0,0 +1,18 @@
+---
+name: Ansible check ubuntu:latest
+
+# yamllint disable-line rule:truthy
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: ansible check with ubuntu:latest
+        uses: roles-ansible/check-ansible-ubuntu-latest-action@master
+        with:
+          targets: "./"
diff --git a/.github/workflows/ansible-ubuntu-trusty.yml b/.github/workflows/ansible-ubuntu-trusty.yml
new file mode 100644
index 0000000..6cde8b8
--- /dev/null
+++ b/.github/workflows/ansible-ubuntu-trusty.yml
@@ -0,0 +1,18 @@
+---
+name: Ansible check ubuntu:trusty
+
+# yamllint disable-line rule:truthy
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: ansible check with ubuntu:trusty
+        uses: roles-ansible/check-ansible-ubuntu-trusty-action@master
+        with:
+          targets: "./"
diff --git a/.github/workflows/yamllint.yaml b/.github/workflows/yamllint.yaml
new file mode 100644
index 0000000..39c49f8
--- /dev/null
+++ b/.github/workflows/yamllint.yaml
@@ -0,0 +1,22 @@
+---
+name: 'Yamllint GitHub Actions'
+
+# yamllint disable-line rule:truthy
+on: [push, pull_request]
+
+jobs:
+  yamllint:
+    name: 'Yamllint'
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout'
+        uses: actions/checkout@master
+      - name: 'Yamllint'
+        uses: karancode/yamllint-github-action@master
+        with:
+          yamllint_file_or_dir: '.'
+          yamllint_config_filepath: './.yamllint'
+          yamllint_strict: false
+          yamllint_comment: true
+#       env:
+#         GITHUB_ACCESS_TOKEN: ${{ secrets.GITHUB_TOKEN }
diff --git a/.yamllint b/.yamllint
new file mode 100644
index 0000000..cb32cb1
--- /dev/null
+++ b/.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
diff --git a/defaults/main.yml b/defaults/main.yml
index 4f3d52b..ce7b7c9 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -5,3 +5,5 @@ submodules_versioncheck: false
 unbound_listen_addresses:
   - '127.0.0.1@53'
   - '::1@53'
+
+unbound__state: 'present'
diff --git a/handlers/main.yml b/handlers/main.yml
index 204352d..b17118a 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,11 +1,10 @@
 ---
 - name: unbound checkconf
   command: unbound-checkconf /etc/unbound/unbound.conf
-  changed_when: True
-  notify: restart unbound
+  changed_when: true
+  notify: systemctl restart unbound
 
-
-- name: restart unbound
+- name: systemctl restart unbound
   service:
     name: unbound
     state: restarted
diff --git a/tasks/main.yml b/tasks/main.yml
index 48c8fcc..ece361d 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -6,8 +6,8 @@
   apt:
     package:
       - unbound
-    state: 'latest'
-    update_cache: yes
+    state: "{{ unbound__state }}"
+    update_cache: true
     cache_valid_time: 43200
 
 
diff --git a/tasks/versioncheck.yml b/tasks/versioncheck.yml
index 7977e52..c4f3337 100644
--- a/tasks/versioncheck.yml
+++ b/tasks/versioncheck.yml
@@ -13,7 +13,7 @@
     src: "/etc/.ansible-version/{{ playbook_version_path }}"
   register: playbook_version
   when: submodules_versioncheck|bool
-  ignore_errors: yes
+  ignore_errors: true
   failed_when: false
 
 - name: Print remote role version
diff --git a/vars/main.yml b/vars/main.yml
index 2e3a78b..6a7cd51 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -1,3 +1,3 @@
 ---
-playbook_version_number: 64 # should be integer
+playbook_version_number: 65  # should be integer
 playbook_version_path: 'role-unbound_roles-ansible_github.com.version'