From 523bf0eb7d5f7aae6c1df962a1fa0eef2679e39a Mon Sep 17 00:00:00 2001 From: L3D Date: Fri, 3 Jul 2020 10:22:11 +0200 Subject: [PATCH 1/3] Update Copyright Info in LICENSE --- LICENSE | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 3bdf835..a9731f3 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,7 @@ MIT License -Copyright (c) 2020 L3D +Copyright (c) 2020 L3D +Copyright (c) 2020 L3D and and contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From b759667653ae0ea43c4d513f9db271a4bf2286e7 Mon Sep 17 00:00:00 2001 From: L3D Date: Fri, 3 Jul 2020 11:21:20 +0200 Subject: [PATCH 2/3] testing deployment --- .github/workflows/ansible-debian-buster.yml | 3 ++- defaults/main.yml | 2 +- handlers/main.yml | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ansible-debian-buster.yml b/.github/workflows/ansible-debian-buster.yml index a7650ad..5737919 100644 --- a/.github/workflows/ansible-debian-buster.yml +++ b/.github/workflows/ansible-debian-buster.yml @@ -11,6 +11,7 @@ jobs: - uses: actions/checkout@v2 - name: ansible check with debian:buster - uses: roles-ansible/check-ansible-debian-buster-action@master + uses: roles-ansible/check-ansible-debian-buster-action@vars with: targets: "./" + vars: "grafana_kiosk:\n manage_systemd: false" diff --git a/defaults/main.yml b/defaults/main.yml index 469e873..9e5cb9b 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -22,7 +22,7 @@ grafana_kiosk: playlist: false URL: https://play.grafana.org ignore_certificate_errors: false - enable_systemd: true + manage_systemd: true display: DISPLAY=:0 lightdm_autologin: false diff --git a/handlers/main.yml b/handlers/main.yml index 131d46b..8ae8894 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -5,4 +5,5 @@ state: restarted name: grafana-kiosk.service daemon_reload: yes - enabled: "{{ grafana_kiosk.enable_systemd | bool }}" + enabled: true + when: grafana_kiosk.manage_systemd | bool From 9f158af86f05a1954da8cb1334664e304b10f1af Mon Sep 17 00:00:00 2001 From: L3D Date: Fri, 3 Jul 2020 12:51:09 +0200 Subject: [PATCH 3/3] improve systemd mngmnt --- .github/workflows/ansible-debian-buster.yml | 2 +- tasks/config.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ansible-debian-buster.yml b/.github/workflows/ansible-debian-buster.yml index 5737919..20a750a 100644 --- a/.github/workflows/ansible-debian-buster.yml +++ b/.github/workflows/ansible-debian-buster.yml @@ -11,7 +11,7 @@ jobs: - uses: actions/checkout@v2 - name: ansible check with debian:buster - uses: roles-ansible/check-ansible-debian-buster-action@vars + uses: roles-ansible/check-ansible-debian-buster-action@master with: targets: "./" vars: "grafana_kiosk:\n manage_systemd: false" diff --git a/tasks/config.yml b/tasks/config.yml index 87bf240..072f888 100644 --- a/tasks/config.yml +++ b/tasks/config.yml @@ -22,6 +22,7 @@ mode: 0664 owner: root group: root + when: grafana_kiosk.manage_systemd | bool notify: systemctl restart grafana-kiosk.service - name: deploy env vars