From 506f51c433c8df784370491199cbafb6595ec243 Mon Sep 17 00:00:00 2001 From: Yujun Zhang Date: Thu, 8 Dec 2016 17:07:41 +0800 Subject: Fix role name error JIRA: QTIP-159 Change-Id: Idb4d43accaf0186f53c338624513e172dc54b9a8 Signed-off-by: Yujun Zhang --- opt/servers/roles/nginx/defaults/main.yml | 10 ++++++++++ opt/servers/roles/nginx/handlers/main.yml | 4 ++++ opt/servers/roles/nginx/tasks/main.yml | 13 +++++++++++++ opt/servers/roles/nginx/templates/elk.conf.j2 | 14 ++++++++++++++ opt/servers/roles/nginx/templates/qtip.conf.j2 | 17 +++++++++++++++++ opt/servers/roles/nginx/templates/testapi.conf.j2 | 17 +++++++++++++++++ opt/servers/roles/ngnix/defaults/main.yml | 10 ---------- opt/servers/roles/ngnix/handlers/main.yml | 4 ---- opt/servers/roles/ngnix/tasks/main.yml | 13 ------------- opt/servers/roles/ngnix/templates/elk.conf.j2 | 14 -------------- opt/servers/roles/ngnix/templates/qtip.conf.j2 | 17 ----------------- opt/servers/roles/ngnix/templates/testapi.conf.j2 | 17 ----------------- 12 files changed, 75 insertions(+), 75 deletions(-) create mode 100644 opt/servers/roles/nginx/defaults/main.yml create mode 100644 opt/servers/roles/nginx/handlers/main.yml create mode 100644 opt/servers/roles/nginx/tasks/main.yml create mode 100644 opt/servers/roles/nginx/templates/elk.conf.j2 create mode 100644 opt/servers/roles/nginx/templates/qtip.conf.j2 create mode 100644 opt/servers/roles/nginx/templates/testapi.conf.j2 delete mode 100644 opt/servers/roles/ngnix/defaults/main.yml delete mode 100644 opt/servers/roles/ngnix/handlers/main.yml delete mode 100644 opt/servers/roles/ngnix/tasks/main.yml delete mode 100644 opt/servers/roles/ngnix/templates/elk.conf.j2 delete mode 100644 opt/servers/roles/ngnix/templates/qtip.conf.j2 delete mode 100644 opt/servers/roles/ngnix/templates/testapi.conf.j2 (limited to 'opt') diff --git a/opt/servers/roles/nginx/defaults/main.yml b/opt/servers/roles/nginx/defaults/main.yml new file mode 100644 index 00000000..cdd1d773 --- /dev/null +++ b/opt/servers/roles/nginx/defaults/main.yml @@ -0,0 +1,10 @@ +--- +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' } + +testapi_services: + - { name: testapi, upstream: 'http://127.0.0.1:8000' } diff --git a/opt/servers/roles/nginx/handlers/main.yml b/opt/servers/roles/nginx/handlers/main.yml new file mode 100644 index 00000000..35585363 --- /dev/null +++ b/opt/servers/roles/nginx/handlers/main.yml @@ -0,0 +1,4 @@ +--- +- name: restart nginx + become: true + service: name=nginx state=restarted diff --git a/opt/servers/roles/nginx/tasks/main.yml b/opt/servers/roles/nginx/tasks/main.yml new file mode 100644 index 00000000..5c78166c --- /dev/null +++ b/opt/servers/roles/nginx/tasks/main.yml @@ -0,0 +1,13 @@ +--- +- 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 + - testapi + notify: + - restart nginx diff --git a/opt/servers/roles/nginx/templates/elk.conf.j2 b/opt/servers/roles/nginx/templates/elk.conf.j2 new file mode 100644 index 00000000..271690e0 --- /dev/null +++ b/opt/servers/roles/nginx/templates/elk.conf.j2 @@ -0,0 +1,14 @@ +# {{ 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/opt/servers/roles/nginx/templates/qtip.conf.j2 b/opt/servers/roles/nginx/templates/qtip.conf.j2 new file mode 100644 index 00000000..3a15c6ba --- /dev/null +++ b/opt/servers/roles/nginx/templates/qtip.conf.j2 @@ -0,0 +1,17 @@ +# {{ 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 %} diff --git a/opt/servers/roles/nginx/templates/testapi.conf.j2 b/opt/servers/roles/nginx/templates/testapi.conf.j2 new file mode 100644 index 00000000..6a4d388b --- /dev/null +++ b/opt/servers/roles/nginx/templates/testapi.conf.j2 @@ -0,0 +1,17 @@ +# {{ ansible_managed }} + +# servers +# +{% for service in testapi_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 %} diff --git a/opt/servers/roles/ngnix/defaults/main.yml b/opt/servers/roles/ngnix/defaults/main.yml deleted file mode 100644 index cdd1d773..00000000 --- a/opt/servers/roles/ngnix/defaults/main.yml +++ /dev/null @@ -1,10 +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' } - -testapi_services: - - { name: testapi, upstream: 'http://127.0.0.1:8000' } diff --git a/opt/servers/roles/ngnix/handlers/main.yml b/opt/servers/roles/ngnix/handlers/main.yml deleted file mode 100644 index 35585363..00000000 --- a/opt/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/opt/servers/roles/ngnix/tasks/main.yml b/opt/servers/roles/ngnix/tasks/main.yml deleted file mode 100644 index 5c78166c..00000000 --- a/opt/servers/roles/ngnix/tasks/main.yml +++ /dev/null @@ -1,13 +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 - - testapi - notify: - - restart nginx diff --git a/opt/servers/roles/ngnix/templates/elk.conf.j2 b/opt/servers/roles/ngnix/templates/elk.conf.j2 deleted file mode 100644 index 271690e0..00000000 --- a/opt/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/opt/servers/roles/ngnix/templates/qtip.conf.j2 b/opt/servers/roles/ngnix/templates/qtip.conf.j2 deleted file mode 100644 index 3a15c6ba..00000000 --- a/opt/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 %} diff --git a/opt/servers/roles/ngnix/templates/testapi.conf.j2 b/opt/servers/roles/ngnix/templates/testapi.conf.j2 deleted file mode 100644 index 6a4d388b..00000000 --- a/opt/servers/roles/ngnix/templates/testapi.conf.j2 +++ /dev/null @@ -1,17 +0,0 @@ -# {{ ansible_managed }} - -# servers -# -{% for service in testapi_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 %} -- cgit 1.2.3-korg