diff --git a/chef/cookbooks/common/files/default/iptables b/chef/cookbooks/common/files/default/iptables index 63b15b9c0444a5760b42b5b3df3d51ae086a8577..7fa13a0aa667b7275795e35985a9feeabf5d738f 100644 --- a/chef/cookbooks/common/files/default/iptables +++ b/chef/cookbooks/common/files/default/iptables @@ -15,6 +15,8 @@ -A RH-Firewall-1-INPUT -m state --state NEW -m tcp -p tcp --dport 80 -j ACCEPT #HTTPS -A RH-Firewall-1-INPUT -m state --state NEW -m tcp -p tcp --dport 443 -j ACCEPT +#Resque-Web +-A RH-Firewall-1-INPUT -m state --state NEW -m tcp -p tcp --dport 5678 -j ACCEPT #Websocket -A RH-Firewall-1-INPUT -m state --state NEW -m tcp -p tcp --dport 8080 -j ACCEPT #Crossdomain policy file for Flash sockets diff --git a/chef/cookbooks/common/templates/default/nginx.conf.erb b/chef/cookbooks/common/templates/default/nginx.conf.erb index b927e7c0e5f871a697bfee21faee071a5ea076b0..e294d49078d09f36e576720cf49b62bcc957241f 100644 --- a/chef/cookbooks/common/templates/default/nginx.conf.erb +++ b/chef/cookbooks/common/templates/default/nginx.conf.erb @@ -35,9 +35,6 @@ http { server <%="localhost:#{port}"%>; <% end %> } - upstream resque_web { - server "localhost:5678"; - } server { listen 843; @@ -53,24 +50,6 @@ http { } } - server { - listen 80; - server_name resque.<%= @url %>; - rewrite ^(.*) https://resque.<%= @url %>$1 permanent; - } - server { - - listen 443; - server_name resque.<%= @url %>; - - ssl on; - ssl_certificate /usr/local/nginx/conf/diaspora.crt; - ssl_certificate_key /usr/local/nginx/conf/diaspora.key; - - location / { - proxy_pass http://resque_web; - } - } server { listen 80; @@ -88,6 +67,7 @@ http { ssl_certificate <%= @cert_location %>; ssl_certificate_key <%= @key_location %>; + location / { proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;