Adjust folder structure

Note: this patchset may break existing features, but it will help
to accelerate the refactoring work.

JIRA: QTIP-131

Change-Id: Ie0cd9d185e6b02316878daef905e26f4e533a66b
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>

5 files changed, 0 insertions, 54 deletions

diff --git a/supporting/servers/roles/ngnix/defaults/main.yml b/supporting/servers/roles/ngnix/defaults/main.yml
deleted file mode 100644
index cb3b3934..00000000
--- a/supporting/servers/roles/ngnix/defaults/main.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-services:
-  - { name: kibana, upstream: 'http://127.0.0.1:5601' }
-  - { name: elastic, upstream: 'http://127.0.0.1:9200' }
-
-qtip_services:
-  - { name: restful_api, upstream: 'http://127.0.0.1:5000' }
diff --git a/supporting/servers/roles/ngnix/handlers/main.yml b/supporting/servers/roles/ngnix/handlers/main.yml
deleted file mode 100644
index 35585363..00000000
--- a/supporting/servers/roles/ngnix/handlers/main.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- name: restart nginx
-  become: true
-  service: name=nginx state=restarted
diff --git a/supporting/servers/roles/ngnix/tasks/main.yml b/supporting/servers/roles/ngnix/tasks/main.yml
deleted file mode 100644
index ec146850..00000000
--- a/supporting/servers/roles/ngnix/tasks/main.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-- name: nginx is installed
-  become: true
-  package: name=nginx state=present
-- name: qtip server configuration is generated
-  become: true
-  template: src={{ item }}.conf.j2 dest=/etc/nginx/sites-enabled/{{ item }}.conf
-  with_items:
-    - elk
-    - qtip
-  notify:
-    - restart nginx
diff --git a/supporting/servers/roles/ngnix/templates/elk.conf.j2 b/supporting/servers/roles/ngnix/templates/elk.conf.j2
deleted file mode 100644
index 271690e0..00000000
--- a/supporting/servers/roles/ngnix/templates/elk.conf.j2
+++ /dev/null
@@ -1,14 +0,0 @@
-# {{ ansible_managed }}
-
-# servers
-#
-{% for service in services %}
-server {
-  listen 80;
-  listen 443 ssl;
-  server_name {{ service.name }}.qtip.openzero.net;
-  location / {
-    proxy_pass {{ service.upstream }};
-  }
-}
-{% endfor %}
diff --git a/supporting/servers/roles/ngnix/templates/qtip.conf.j2 b/supporting/servers/roles/ngnix/templates/qtip.conf.j2
deleted file mode 100644
index 3a15c6ba..00000000
--- a/supporting/servers/roles/ngnix/templates/qtip.conf.j2
+++ /dev/null
@@ -1,17 +0,0 @@
-# {{ ansible_managed }}
-
-# servers
-#
-{% for service in qtip_services %}
-server {
-  listen 80;
-  listen 443 ssl;
-  server_name {{ service.name }}.qtip.openzero.net;
-  location / {
-    proxy_pass {{ service.upstream }};
-    sub_filter {{ service.upstream }}  'http://{{ service.name }}.qtip.openzero.net';
-    sub_filter_once off;
-    sub_filter_types text/html application/json;
-  }
-}
-{% endfor %}