diff options
| -rw-r--r-- | ansible/group_vars/all | 1 | ||||
| -rw-r--r-- | ansible/host_vars/kbuilds01.linaro.org | 1 | ||||
| -rw-r--r-- | ansible/host_vars/new-kernelci | 2 | ||||
| -rw-r--r-- | ansible/hosts | 1 | ||||
| -rw-r--r-- | ansible/roles/common/tasks/main.yml | 1 | ||||
| -rw-r--r-- | ansible/roles/configure-nginx/files/nginx-local.conf | 2 | ||||
| -rw-r--r-- | ansible/roles/configure-nginx/tasks/main.yml | 6 | ||||
| -rw-r--r-- | ansible/roles/install-app/tasks/main.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/install-app/templates/flask_settings | 4 | ||||
| -rw-r--r-- | ansible/roles/install-deps/tasks/main.yml | 1 | ||||
| -rw-r--r-- | ansible/site.yml | 2 |
11 files changed, 17 insertions, 8 deletions
diff --git a/ansible/group_vars/all b/ansible/group_vars/all index 7dc7010..f9a9a50 100644 --- a/ansible/group_vars/all +++ b/ansible/group_vars/all @@ -5,3 +5,4 @@ web_user: www-data app_user: www-data web_root: /usr/share/nginx/html git_head: HEAD +role: production diff --git a/ansible/host_vars/kbuilds01.linaro.org b/ansible/host_vars/kbuilds01.linaro.org index d20bddd..93cadeb 100644 --- a/ansible/host_vars/kbuilds01.linaro.org +++ b/ansible/host_vars/kbuilds01.linaro.org @@ -1 +1,2 @@ hostname: kbuilds01.linaro.org +role: staging diff --git a/ansible/host_vars/new-kernelci b/ansible/host_vars/new-kernelci new file mode 100644 index 0000000..4357922 --- /dev/null +++ b/ansible/host_vars/new-kernelci @@ -0,0 +1,2 @@ +hostname: status.armcloud.us +role: production diff --git a/ansible/hosts b/ansible/hosts index ebd82a8..f9df121 100644 --- a/ansible/hosts +++ b/ansible/hosts @@ -1,3 +1,4 @@ [all] frontend.kernel-ci.linaro.org kbuilds01.linaro.org +new-kernelci diff --git a/ansible/roles/common/tasks/main.yml b/ansible/roles/common/tasks/main.yml index 9049e2a..32cb2ca 100644 --- a/ansible/roles/common/tasks/main.yml +++ b/ansible/roles/common/tasks/main.yml @@ -1,3 +1,2 @@ --- -- include: host-nickname.yml - include: net-sysctl.yml diff --git a/ansible/roles/configure-nginx/files/nginx-local.conf b/ansible/roles/configure-nginx/files/nginx-local.conf index ee433ec..dec68cc 100644 --- a/ansible/roles/configure-nginx/files/nginx-local.conf +++ b/ansible/roles/configure-nginx/files/nginx-local.conf @@ -18,6 +18,7 @@ client_body_timeout 60; send_timeout 60; keepalive_timeout 65 20; proxy_read_timeout 120; +proxy_next_upstream error; gzip on; gzip_min_length 50; @@ -28,7 +29,6 @@ gzip_comp_level 7; gzip_buffers 16 8k; gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript; - client_header_buffer_size 1k; client_body_buffer_size 128k; large_client_header_buffers 4 4k; diff --git a/ansible/roles/configure-nginx/tasks/main.yml b/ansible/roles/configure-nginx/tasks/main.yml index 46a1efd..955981d 100644 --- a/ansible/roles/configure-nginx/tasks/main.yml +++ b/ansible/roles/configure-nginx/tasks/main.yml @@ -38,7 +38,7 @@ - name: Install frontend nginx configuration template: src=kernelci-frontend.conf - dest=/etc/nginx/sites-available/kernelci-frontend + dest=/etc/nginx/sites-available/{{ hostname }} owner=root group=root mode=0644 @@ -49,8 +49,8 @@ - name: Enable frontend website file: state=link - src=/etc/nginx/sites-available/kernelci-frontend - dest=/etc/nginx/sites-enabled/kernelci-frontend + src=/etc/nginx/sites-available/{{ hostname }} + dest=/etc/nginx/sites-enabled/{{ hostname }} owner=root group=root tags: diff --git a/ansible/roles/install-app/tasks/main.yml b/ansible/roles/install-app/tasks/main.yml index 37953ca..6d9b47a 100644 --- a/ansible/roles/install-app/tasks/main.yml +++ b/ansible/roles/install-app/tasks/main.yml @@ -39,9 +39,9 @@ - install - app -- name: Copy Flask settings file +- name: Copy app settings file template: src=flask_settings - dest=/etc/flask_settings + dest=/etc/linaro/kernelci-frontend.cfg owner=root group=root mode=0644 diff --git a/ansible/roles/install-app/templates/flask_settings b/ansible/roles/install-app/templates/flask_settings index 4e46345..5d1ea1b 100644 --- a/ansible/roles/install-app/templates/flask_settings +++ b/ansible/roles/install-app/templates/flask_settings @@ -9,5 +9,9 @@ SECRET_KEY = '{{ secret_key }}' # Add the trailing slash! FILE_SERVER_URL = 'http://armcloud.us/kernel-ci/' +{% if role == "production" %} DEBUG = False +{% else %} +DEBUG = True +{% endif %} TESTING = DEBUG diff --git a/ansible/roles/install-deps/tasks/main.yml b/ansible/roles/install-deps/tasks/main.yml index fc2a020..e7ee1f5 100644 --- a/ansible/roles/install-deps/tasks/main.yml +++ b/ansible/roles/install-deps/tasks/main.yml @@ -17,6 +17,7 @@ - name: Add nginx stable PPA repository apt_repository: repo='ppa:nginx/stable' + when: ansible_lsb.id == "Ubuntu" - name: Install nginx from stable PPA repository apt: pkg=nginx diff --git a/ansible/site.yml b/ansible/site.yml index 952d0cd..806108c 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -1,7 +1,7 @@ --- - hosts: all sudo: yes - gather_facts: no + gather_facts: yes roles: - common - install-deps |