From ff3c65892f0ee670574d2001be833c26b72b30f3 Mon Sep 17 00:00:00 2001 From: Ricky Elrod Date: Wed, 29 Jun 2016 15:01:57 +0000 Subject: [PATCH] prep ssl stuff for grafana, maybe. I will commit the start of a certbot role later. Signed-off-by: Ricky Elrod --- roles/graphite/grafana/files/grafana.conf | 7 ----- roles/graphite/grafana/tasks/main.yml | 2 +- roles/graphite/grafana/templates/grafana.conf | 28 +++++++++++++++++++ 3 files changed, 29 insertions(+), 8 deletions(-) delete mode 100644 roles/graphite/grafana/files/grafana.conf create mode 100644 roles/graphite/grafana/templates/grafana.conf diff --git a/roles/graphite/grafana/files/grafana.conf b/roles/graphite/grafana/files/grafana.conf deleted file mode 100644 index 4c25da333f..0000000000 --- a/roles/graphite/grafana/files/grafana.conf +++ /dev/null @@ -1,7 +0,0 @@ - - ServerName grafana.cloud.fedoraproject.org - ErrorLog /var/log/httpd/grafana-error.log - CustomLog /var/log/httpd/grafana-access.log common - ProxyPass / http://localhost:3000/ - ProxyPassReverse / http://localhost:3000/ - diff --git a/roles/graphite/grafana/tasks/main.yml b/roles/graphite/grafana/tasks/main.yml index faa56212ba..119c55fd8a 100644 --- a/roles/graphite/grafana/tasks/main.yml +++ b/roles/graphite/grafana/tasks/main.yml @@ -36,7 +36,7 @@ - grafana - name: grafana apache proxy config file - copy: src=grafana.conf dest=/etc/httpd/conf.d/grafana.conf owner=root group=root mode=644 + template: src=grafana.conf dest=/etc/httpd/conf.d/grafana.conf owner=root group=root mode=644 notify: - restart apache tags: diff --git a/roles/graphite/grafana/templates/grafana.conf b/roles/graphite/grafana/templates/grafana.conf new file mode 100644 index 0000000000..a6ecc8123a --- /dev/null +++ b/roles/graphite/grafana/templates/grafana.conf @@ -0,0 +1,28 @@ + + ServerName grafana.cloud.fedoraproject.org + ServerAlias grafana.fedorainfracloud.org + ErrorLog /var/log/httpd/grafana-error.log + CustomLog /var/log/httpd/grafana-access.log common + ProxyPass / http://localhost:3000/ + ProxyPassReverse / http://localhost:3000/ + + RewriteEngine on + RewriteRule ^/\.well-known/(.*) /srv/web/acme-challenge/.well-known/$1 [L] + + + + ServerName grafana.cloud.fedoraproject.org + ServerAlias grafana.fedorainfracloud.org + + SSLEngine on + SSLCertificateFile /etc/letsencrypt/live/grafana.cloud.fedoraproject.org/cert.pem + SSLCertificateKeyFile /etc/letsencrypt/live/grafana.cloud.fedoraproject.org/privkey.pem + SSLCertificateChainFile /etc/letsencrypt/live/grafana.cloud.fedoraproject.org/fullchain.pem + SSLHonorCipherOrder On + SSLCipherSuite RC4-SHA:AES128-SHA:ALL:!ADH:!EXP:!LOW:!MD5:!SSLV2:!NULL + SSLProtocol ALL -SSLv2 + + ProxyPass / http://localhost:3000/ + ProxyPassReverse / http://localhost:3000/ + +