Skip to content

Commit

Permalink
Merge pull request #283 from subutai-io/nginx-272
Browse files Browse the repository at this point in the history 
Revert nginx changes for #272
  • Loading branch information
@etursunbaev
etursunbaev authored Feb 28, 2018
2 parents d6ac0e1 + 730f138 commit c4b40cf
Showing 1 changed file with 4 additions and 19 deletions.
23 changes: 4 additions & 19 deletions extras/etc/nginx/nginx.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,6 @@ http {
include "/var/snap/subutai-master/current/nginx/conf.d/*.conf";
include "/var/snap/subutai-sysnet/current/nginx/conf.d/*.conf";

upstream ubuntu-archive {
ip_hash;
server archive.ubuntu.com max_fails=10;
server us.archive.ubuntu.com max_fails=10;
server 91.189.88.161 backup;
server 91.189.88.149 backup;
}

upstream ubuntu-security {
ip_hash;
server security.ubuntu.com max_fails=10;
server 91.189.91.26 backup;
server 91.189.91.23 backup;
}

server {
listen 80;
server_name localhost;
Expand All @@ -66,26 +51,26 @@ http {
}

location /apt/main/dists {
proxy_pass http://ubuntu-archive/ubuntu/dists/;
proxy_pass http://archive.ubuntu.com/ubuntu/dists/;
proxy_cache DEBIDX;
proxy_cache_valid 5m;
}

location /apt/main {
proxy_pass http://ubuntu-archive/ubuntu/;
proxy_pass http://archive.ubuntu.com/ubuntu/;
proxy_cache DEB;
proxy_cache_valid 1d;
proxy_ignore_headers "Cache-Control" "Expires";
}

location /apt/security/dists {
proxy_pass http://ubuntu-security/ubuntu/dists;
proxy_pass http://security.ubuntu.com/ubuntu/dists;
proxy_cache DEBIDX;
proxy_cache_valid 5m;
}

location /apt/security {
proxy_pass http://ubuntu-security/ubuntu/;
proxy_pass http://security.ubuntu.com/ubuntu/;
proxy_cache DEB;
proxy_cache_valid 1d;
proxy_ignore_headers "Cache-Control" "Expires";
Expand Down

0 comments on commit c4b40cf

Please sign in to comment.