From 858cd24419e6fe05b6695f21f29daddaf0137fce Mon Sep 17 00:00:00 2001 From: Mykola Marzhan Date: Tue, 31 Jan 2017 15:37:37 +0200 Subject: [PATCH] refactor password page --- nginx.conf | 20 +++-- password-page/fail.html | 41 ---------- password-page/index.html | 161 ++++++++++++++++++++++++++++++++----- password-page/success.html | 41 ---------- 4 files changed, 157 insertions(+), 106 deletions(-) delete mode 100644 password-page/fail.html delete mode 100644 password-page/success.html diff --git a/nginx.conf b/nginx.conf index c02c886ca..cfbdf705d 100644 --- a/nginx.conf +++ b/nginx.conf @@ -8,17 +8,22 @@ listen 443 ssl; server_name _; server_tokens off; - root /usr/share/pmm-server/landing-page; ssl_certificate /srv/nginx/certificate.crt; ssl_certificate_key /srv/nginx/certificate.key; ssl_trusted_certificate /srv/nginx/ca-certs.pem; ssl_dhparam /srv/nginx/dhparam.pem; - ## BEGIN Those lines are managed from entrypoint.sh - auth_basic off; - auth_basic_user_file .htpasswd; - ## END + # Authentification + set $root "/usr/share/pmm-server/landing-page"; + set $realm on; + if (!-f /srv/nginx/.htpasswd) { + set $root "/usr/share/pmm-server/password-page"; + set $realm off; + } + root $root; + auth_basic $realm; + auth_basic_user_file /srv/nginx/.htpasswd; # Grafana rewrite ^/graph$ /graph/; @@ -65,4 +70,9 @@ location /orchestrator { proxy_pass http://127.0.0.1:4000; } + + # Configurator + location /configurator { + proxy_pass http://127.0.0.1:7777; + } } diff --git a/password-page/fail.html b/password-page/fail.html deleted file mode 100644 index 04766e486..000000000 --- a/password-page/fail.html +++ /dev/null @@ -1,41 +0,0 @@ - - - - - PMM - Set Password - - - - - - - -
-
-
-
-
-
- -
-
-

- Welcome to the simplest installation process in the world. Just fill in the information and you will be able to use the most - modern and powerful solution for managing and mnitoring performance on MySQL and MongoDB. -

-
-
-
-
-
-
-
- -
-
-
- - - \ No newline at end of file diff --git a/password-page/index.html b/password-page/index.html index ca3ea20ea..ec9c7b718 100644 --- a/password-page/index.html +++ b/password-page/index.html @@ -6,6 +6,7 @@ + @@ -15,13 +16,12 @@
-
- +
+
-
-

- Welcome to the simplest installation process in the world. Just fill in the information and you will be able to use the most - modern and powerful solution for managing and mnitoring performance on MySQL and MongoDB. +
+

+ Welcome to the simplest installation process in the world. Just fill in the information and you will be able to use the most modern and powerful solution for managing and monitoring performance on MySQL and MongoDB.

@@ -30,24 +30,35 @@

-
-
- - -
-
- - + + +
+
+ + +
+
+ + +
+
+ + +
-
- +
+
+ SSH Public Key + +
+
- - @@ -58,4 +69,116 @@

- \ No newline at end of file + + + diff --git a/password-page/success.html b/password-page/success.html deleted file mode 100644 index 7be465816..000000000 --- a/password-page/success.html +++ /dev/null @@ -1,41 +0,0 @@ - - - - - PMM - Set Password - - - - - - - -
-
-
-
-
-
- -
-
-

- Welcome to the simplest installation process in the world. Just fill in the information and you will be able to use the most - modern and powerful solution for managing and mnitoring performance on MySQL and MongoDB. -

-
-
-
-
-
-
-
- -
-
-
- - - \ No newline at end of file