commit ef349d9224f93fcc3eeb7a26f71c6a128ffbf96a
author David Garcia <david.garcia@canonical.com> Thu Dec 10 21:16:12 2020 +0100
committer David Garcia <david.garcia@canonical.com> Tue Dec 15 19:34:16 2020 +0100
tree 35b93d792643ac6ffec98f743856256fb8304ee5
parent f96d1cf00d281325f915bd966c28013243a31c10

Migrate to new NBI charm, and change in NGUI charm

- Fixes bug 1365
- Changes in the installer:
    - use site_url config to expose both NBI and NG-UI
    - use resources for images
- Changes in the NBI: some minor fixes
- Changes in the NG-UI: follow the same pattern as in the new set of
charms

Change-Id: I6a11009ddf9cd22689602b2a53ecf67f376830cb
Signed-off-by: David Garcia <david.garcia@canonical.com>

installers/charm/ng-ui/files/default

diff --git a/installers/charm/ng-ui/files/default b/installers/charm/ng-ui/files/default
index e014715..f946263 100644
--- a/installers/charm/ng-ui/files/default
+++ b/installers/charm/ng-ui/files/default
@@ -15,16 +15,12 @@
 
 
 server {
-    listen $http_port;
-    listen $https_port default ssl;
+    listen       $port;
     server_name  $server_name;
     root   /usr/share/nginx/html;
     index  index.html index.htm;
-    client_max_body_size $client_max_body_size;
-    $ssl_crt
-    $ssl_crt_key
-    ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
-    ssl_ciphers EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH;
+    client_max_body_size $max_file_size;
+
     location /osm {
         proxy_pass https://$nbi_host:$nbi_port;
         proxy_next_upstream error timeout invalid_header http_500 http_502 http_503 http_504;