aboutsummaryrefslogtreecommitdiff
path: root/ansible/roles
diff options
context:
space:
mode:
authorMilo Casagrande <milo.casagrande@linaro.org>2014-12-19 10:52:03 +0100
committerMilo Casagrande <milo.casagrande@linaro.org>2014-12-19 10:52:03 +0100
commit910a5191b64faf7a4352a66835a8ee86e500f93a (patch)
tree8801419a39d952b1a68f093f3f42d751172e1740 /ansible/roles
parent316539dda03099d03a8faad19ab063f7267bd0cc (diff)
ansible: Add kernelci.org host.
Change-Id: I512ce77c4de1b54a2320c32adf58ceb64907b683
Diffstat (limited to 'ansible/roles')
-rw-r--r--ansible/roles/configure-nginx/tasks/main.yml2
-rw-r--r--ansible/roles/configure-nginx/templates/backend-nginx.conf (renamed from ansible/roles/configure-nginx/templates/api.armcloud.us)0
-rw-r--r--ansible/roles/configure-nginx/templates/kernelci-backend.conf35
-rw-r--r--ansible/roles/configure-nginx/templates/staging.api.armcloud.us58
4 files changed, 1 insertions, 94 deletions
diff --git a/ansible/roles/configure-nginx/tasks/main.yml b/ansible/roles/configure-nginx/tasks/main.yml
index 382d3f5..d2c449a 100644
--- a/ansible/roles/configure-nginx/tasks/main.yml
+++ b/ansible/roles/configure-nginx/tasks/main.yml
@@ -42,7 +42,7 @@
- web-server
- name: Install backend nginx configuration
- template: src={{ hostname }}
+ template: src=backend-nginx.conf
dest=/etc/nginx/sites-available/{{ hostname }}
owner=root
group=root
diff --git a/ansible/roles/configure-nginx/templates/api.armcloud.us b/ansible/roles/configure-nginx/templates/backend-nginx.conf
index 7000072..7000072 100644
--- a/ansible/roles/configure-nginx/templates/api.armcloud.us
+++ b/ansible/roles/configure-nginx/templates/backend-nginx.conf
diff --git a/ansible/roles/configure-nginx/templates/kernelci-backend.conf b/ansible/roles/configure-nginx/templates/kernelci-backend.conf
deleted file mode 100644
index bd76029..0000000
--- a/ansible/roles/configure-nginx/templates/kernelci-backend.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-server {
- listen 80;
- server_name {{ hostname }};
- root {{ web_root }}/{{ hostname }};
- charset utf-8;
-
- access_log /var/log/nginx/{{ hostname }}-access.log;
- error_log /var/log/nginx/{{ hostname }}-error.log;
-
- location / {
- if (-f $document_root/maintenance.html) {
- return 503;
- }
- }
-
- error_page 503 @maintenance;
- location @maintenance {
- rewrite ^(.*)$ /maintenance.html break;
- }
-
- location /api {
- proxy_pass_header Server;
- proxy_set_header Host $http_host;
- proxy_redirect off;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Scheme $scheme;
- proxy_pass http://backends;
- }
-
- location ~* \.(?:ico|css|js|gif|jpe?g|png)$ {
- expires 150d;
- add_header Pragma public;
- add_header Cache-Control "public";
- }
-}
diff --git a/ansible/roles/configure-nginx/templates/staging.api.armcloud.us b/ansible/roles/configure-nginx/templates/staging.api.armcloud.us
deleted file mode 100644
index 7000072..0000000
--- a/ansible/roles/configure-nginx/templates/staging.api.armcloud.us
+++ /dev/null
@@ -1,58 +0,0 @@
-server {
- listen 80;
- server_name {{ hostname }};
- root {{ web_root }}/{{ hostname }};
- charset utf-8;
-
- access_log /var/log/nginx/{{ hostname }}-access.log;
- error_log /var/log/nginx/{{ hostname }}-error.log;
-
- location / {
- if (-f $document_root/maintenance.html) {
- return 503;
- }
-
- autoindex off;
- index index.html;
- }
-
- error_page 503 @maintenance;
- location @maintenance {
- rewrite ^(.*)$ /maintenance.html break;
- }
-
- location ~* \.(?:ico|css|js|gif|jpe?g|png)$ {
- expires 150d;
- add_header Pragma public;
- add_header Cache-Control "public";
- }
-
- location ~* /(?:(count|job|defconfig|boot|token|batch|bisect|lab|version)(.*)(?!(\.(html?|json|css|js))))$ {
-
- if (-f $document_root/maintenance.html) {
- more_set_headers "Content-Type: application/json; charset=UTF-8";
- return 503 '{"code": 503, "reason": "Service maintenance."}';
- }
-
- # Proxy cache, disabled for now.
- # proxy_cache BACKEND;
- # proxy_cache_key $proxy_host$uri$is_args$args;
- # proxy_cache_lock on;
- # proxy_cache_lock_timeout 2s;
- # proxy_cache_valid 3h;
-
- proxy_buffers 32 4k;
- proxy_buffer_size 8k;
- proxy_busy_buffers_size 64k;
- proxy_pass_header Server;
- proxy_set_header Host $http_host;
- proxy_redirect off;
- proxy_set_header X-Real-IP $remote_addr;
- proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
- proxy_set_header X-Scheme $scheme;
- proxy_connect_timeout 9s;
- proxy_send_timeout 9s;
- proxy_read_timeout 9s;
- proxy_pass http://backends;
- }
-}