Skip to content

Commit

Permalink
Add nginx config file to .deb build
Browse files Browse the repository at this point in the history
  • Loading branch information
James Allen committed Aug 19, 2014
1 parent aaf73bd commit 94ce0d3
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 3 deletions.
4 changes: 3 additions & 1 deletion Gruntfile.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,8 @@ module.exports = (grunt) ->
command = ["-s", "dir", "-t", "deb", "-n", "sharelatex", "-v", "0.0.1", "--verbose"]
command.push(
"--maintainer", "ShareLaTeX <[email protected]>"
"--config-files", "/etc/sharelatex/settings.coffee",
"--config-files", "/etc/sharelatex/settings.coffee"
"--config-files", "/etc/nginx/sites-enabled/sharelatex"
"--directories", "/var/lib/sharelatex"
"--directories", "/var/log/sharelatex"
)
Expand Down Expand Up @@ -449,6 +450,7 @@ module.exports = (grunt) ->

command.push(
"package/config/settings.coffee=/etc/sharelatex/settings.coffee"
"package/nginx/sharelatex=/etc/nginx/sites-enabled/sharelatex"
)
console.log "fpm " + command.join(" ")
proc = spawn "fpm", command, stdio: "inherit"
Expand Down
4 changes: 2 additions & 2 deletions chef/cookbooks/mongodb/recipes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
#

# See http://docs.mongodb.org/manual/tutorial/install-mongodb-on-ubuntu/
apt_repository 'mongodb-10gen' do
apt_repository 'mongodb-org' do
uri 'http://downloads-distro.mongodb.org/repo/ubuntu-upstart'
distribution 'dist'
components ['10gen']
keyserver 'keyserver.ubuntu.com'
key '7F0CEB10'
end

package 'mongodb-10gen' do
package 'mongodb-org' do
action :install
end
32 changes: 32 additions & 0 deletions package/nginx/sharelatex
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
server {
listen 80;
server_name _; # Catch all, see http://nginx.org/en/docs/http/server_names.html

set $static_path /var/www/sharelatex/web/public;

location / {
proxy_pass http://localhost:3000;
proxy_set_header Host $http_x_forwarded_host;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_read_timeout 3m;
proxy_send_timeout 3m;
}

location /stylesheets {
expires 1y;
root $static_path/;
}

location /minjs {
expires 1y;
root $static_path/;
}

location /img {
expires 1y;
root $static_path/;
}
}

0 comments on commit 94ce0d3

Please sign in to comment.