From a2cc55cd1e8304ccdd60965f99a21ccf74af1761 Mon Sep 17 00:00:00 2001 From: Alex Dworjan Date: Wed, 8 Nov 2023 13:05:07 -0500 Subject: [PATCH] changed cert timing --- .ansible-sign/sha256sum.txt | 2 +- .ansible-sign/sha256sum.txt.sig | 22 +++++++++--------- Promgraf_collection.yml | 41 ++++++++++++++++++--------------- 3 files changed, 35 insertions(+), 30 deletions(-) diff --git a/.ansible-sign/sha256sum.txt b/.ansible-sign/sha256sum.txt index cf2a9c7..83ddb5f 100644 --- a/.ansible-sign/sha256sum.txt +++ b/.ansible-sign/sha256sum.txt @@ -6,7 +6,7 @@ c8066ae4c79ca812f0abde5b42d4a0bf954a60c88b3eab2149d75d98b567c931 Elastic_restar 34f2b820ddd24642f57eb68f51ec9b990c762f6ac80eebc792cb2c9c42a2f061 MANIFEST.in 2e796c430ae2e8f0d061770ae1f58b19aaa8aec077388a73051dd71a316c4218 Nodeexporter.yml 5d7e02fa3a7a73509e6626d581883804627acec2859ded3b934418dce963f6be Promgraf.yml -7f3d494d3bdd71f457c1c37711ab3da77b719e1bd8b8d298234110e3b243d108 Promgraf_collection.yml +eda6c139966bf5e0674258057fc3cd1c24ec63fae39e250c6deb6ea4469d9927 Promgraf_collection.yml 798346886b7ec801a19ed365c33f092e2d5dfb564c034ae886bc51785c89b232 README.md e7106815fb74fd3100fa110ffc0d90b0ea09ac3953af2c90b93e02756b02e637 collections/requirements.yml bcc7a97fdb676c3f94875a674a87d25cd286cabba5820a5bb0a3eb228951b568 email.yml diff --git a/.ansible-sign/sha256sum.txt.sig b/.ansible-sign/sha256sum.txt.sig index 6af29c6..867df38 100644 --- a/.ansible-sign/sha256sum.txt.sig +++ b/.ansible-sign/sha256sum.txt.sig @@ -1,14 +1,14 @@ -----BEGIN PGP SIGNATURE----- -iQGzBAABCAAdFiEE/bJvyFHKKJdaZDOLTiIiIXrUDNEFAmVLyT4ACgkQTiIiIXrU -DNEAGQv/XIdLLYcK+/MocB+5bdXNEPOTY1J5Ozn9ah9QvrkTM96vktt1O0nbKHLN -sGyKCy9u52QgwBWeUtfR68+UGqelgPvBj4IAo3nBnHQ6CLn6tkKc1r1LB3ZJsveu -/Lf5FRR10u6oE6db5ZfXK2NIzG2bJJ7HKSX82qn1AoFaBNknCNVBg4GFLCxhCKd7 -n/LP2QiQ/RuyUt5DXHknHw2g4GuvjbQ47oD+b2/B4cf9NZzGqSptxJIkgvCtICCQ -B1bOPD2lC3TzG8Q48+cUkL3X04lxaWYKxybU70LizVMr4MqN1w2qvYR5oqubXvjw -BNmtxmfZW56fRKJhvDOsWRKpXRSPwb18QkNUx/sI95IlE3dRqSpy+3pyWkpidQ0i -7oBX5GXGQHccMNAIYwP4YrJzd+9snZtYm735x5LQPNfA9BjspoZbFns9QILpZPJJ -VpvN5tDIQGsmEyYoLOwW5FCWgfZy5i3DCYdeXr0XSLCGGOdcH/YaqO2kyFuQ1f+6 -p+AODTRt -=iTx5 +iQGzBAABCAAdFiEE/bJvyFHKKJdaZDOLTiIiIXrUDNEFAmVLzcEACgkQTiIiIXrU +DNFaDwwAlAVACt1p10AqvhRvplV7Ewixuj+s2rfYEmZeewfI6CrUpSgERECtOFl7 +SVkYR2G6j7Bemwk4dEpp0sY1ZO36m3f0KwQ3B2PsP8hLRU8nLMxAONVdISfHPzqZ +CByw4QmC0SpdzihTPiVlQFZt3+BIXI/lNb+2q7gKRr9OHTnUKtFMJPy9ZmGVewut +dorypVCshyQXgAeB3OouriK9H3M7AfalhOyElS3GXtLZyDSaA1wJBT4irIQJhN+M +ymKAhBitQdWzAUeyOZnjZbZz70QandNWXn5YP6cxf/Tn5gOVh5SHbP4b+MOZqqkn +hDAqkKPzMF9IIsxxp3yIiitLEkOjNmprxG//BamyhL9aBKiApESecs+ncqFpRPCp +Jyz1ps6VK6Dz10yQ+dVjdzNSoDXK1PdEKjuh74NgaBPGmvzRiG0MoOt2Su1vTRpS ++9F3yUXZt9MEeApitmiWvRdRrKgtKaihwS4A/idG+SMhgwYMGZC46FUsvNxvKd3R +6+DJftyq +=4XCf -----END PGP SIGNATURE----- diff --git a/Promgraf_collection.yml b/Promgraf_collection.yml index 33c1c5d..2fb6384 100644 --- a/Promgraf_collection.yml +++ b/Promgraf_collection.yml @@ -125,24 +125,6 @@ router_logging: false serve_from_sub_path: false - pre_tasks: - - - name: Copy Cert for grafana - ansible.builtin.copy: - src: /certs/shadowman_cert.cer - dest: /etc/grafana/shadowman_cert.cer - owner: grafana - group: grafana - mode: '0644' - - - name: Copy Key for grafana - ansible.builtin.copy: - src: /certs/shadowman_private.key - dest: /etc/grafana/shadowman_private.key - owner: grafana - group: grafana - mode: '0644' - roles: - prometheus.prometheus.prometheus - prometheus.prometheus.alertmanager @@ -165,6 +147,23 @@ group: root mode: '0644' + - name: Copy Cert for grafana + ansible.builtin.copy: + src: /certs/shadowman_cert.cer + dest: /etc/grafana/shadowman_cert.cer + owner: grafana + group: grafana + mode: '0644' + notify: restart_grafana + + - name: Copy Key for grafana + ansible.builtin.copy: + src: /certs/shadowman_private.key + dest: /etc/grafana/shadowman_private.key + owner: grafana + group: grafana + mode: '0644' + - name: Install httpd ansible.builtin.package: name: httpd @@ -218,3 +217,9 @@ name: httpd state: started enabled: true + + - name: "Restart grafana" + ansible.builtin.service: + name: grafana-server + state: restarted + listen: "restart_grafana"